From 609ca40e6967201957a28e213ff8a32c3227866d Mon Sep 17 00:00:00 2001 From: Moritz Heiber Date: Mon, 28 May 2018 17:30:36 +0200 Subject: [PATCH 01/52] Tweaked the Docker configuration --- .dockerignore | 1 + Dockerfile | 40 +++++++++++++++++++++++++------------ contrib/nginx.conf | 2 +- docker-compose.yml | 49 +++++++++++++++++++++++++++++++++------------- 4 files changed, 65 insertions(+), 27 deletions(-) diff --git a/.dockerignore b/.dockerignore index 5d4b8fcc0..10cb02760 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,7 @@ storage data Dockerfile +docker-compose.yml .dockerignore .git .gitignore diff --git a/Dockerfile b/Dockerfile index c076c6672..ec457f905 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,33 @@ -FROM php:7.2-fpm-alpine +FROM php:7.2.6-fpm-alpine -RUN apk add --no-cache git imagemagick \ - && apk add --no-cache --virtual .build build-base autoconf imagemagick-dev libtool \ - && docker-php-ext-install pdo_mysql pcntl \ - && pecl install imagick \ - && docker-php-ext-enable imagick \ - && apk del --purge .build +ARG COMPOSER_VERSION="1.6.5" +ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434" -RUN curl -sS https://getcomposer.org/installer | php \ - && mv composer.phar /usr/local/bin/ \ - && ln -s /usr/local/bin/composer.phar /usr/local/bin/composer +RUN apk add --no-cache --virtual .build build-base autoconf imagemagick-dev libtool && \ + apk --no-cache add imagemagick git && \ + docker-php-ext-install pdo_mysql pcntl && \ + pecl install imagick && \ + docker-php-ext-enable imagick pcntl imagick && \ + curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /tmp/composer.phar && \ + echo "${COMPOSER_CHECKSUM} /tmp/composer.phar" | sha256sum -c - && \ + install -m0755 -o root -g root /tmp/composer.phar /usr/bin/composer.phar && \ + ln -sf /usr/bin/composer.phar /usr/bin/composer && \ + mkdir -p /var/www && \ + install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed && \ + install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed/storage && \ + install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed/storage/framework && \ + install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed/storage/framework/sessions && \ + install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed/storage/framework/views && \ + install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed/storage/framework/cache && \ + rm /tmp/composer.phar && \ + apk del --purge .build -WORKDIR /var/www/html -COPY . . +COPY --chown=www-data . /var/www/html/pixelfed/ + +WORKDIR /var/www/html/pixelfed +USER www-data RUN composer install --prefer-source --no-interaction + +VOLUME ["/var/www/html"] +USER root ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}" diff --git a/contrib/nginx.conf b/contrib/nginx.conf index c39103d5a..39cfbdf4d 100644 --- a/contrib/nginx.conf +++ b/contrib/nginx.conf @@ -4,7 +4,7 @@ server { server_name localhost; index index.php index.html; - root /var/www/html/public; + root /var/www/html/pixelfed/public; location / { try_files $uri $uri/ /index.php; diff --git a/docker-compose.yml b/docker-compose.yml index d9c39bd2f..b49b77a77 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,37 +3,58 @@ version: '3' services: nginx: image: nginx:alpine + networks: + - internal + - external ports: - 3000:80 volumes: - - .:/var/www/html + - "php-storage:/var/www/html" - ./contrib/nginx.conf:/etc/nginx/conf.d/default.conf depends_on: - - php + - php + php: build: . + image: pixelfed volumes: - - ./storage:/var/www/html/storage - depends_on: - - mysql - - redis + - "php-storage:/var/www/html" + networks: + - internal environment: - DB_HOST=mysql - DB_DATABASE=pixelfed - - DB_USERNAME=${DB_USERNAME} - - DB_PASSWORD=${DB_PASSWORD} + - DB_USERNAME=${DB_USERNAME:-pixelfed} + - DB_PASSWORD=${DB_PASSWORD:-pixelfed} - REDIS_HOST=redis - - APP_KEY=${APP_KEY} + - APP_KEY=${APP_KEY:-app_key} + mysql: image: mysql:5.7 + networks: + - internal environment: - MYSQL_DATABASE=pixelfed - - MYSQL_USER=${DB_USERNAME} - - MYSQL_PASSWORD=${DB_PASSWORD} + - MYSQL_USER=${DB_USERNAME:-pixelfed} + - MYSQL_PASSWORD=${DB_PASSWORD:-pixelfed} + - MYSQL_RANDOM_ROOT_PASSWORD="true" volumes: - - ./docker-volumes/mysql:/var/lib/mysql + - "mysql-data:/var/lib/mysql" + redis: image: redis:alpine volumes: - - ./docker-volumes/redis:/data -... + - "redis-data:/data" + networks: + - internal + +volumes: + redis-data: + mysql-data: + php-storage: + +networks: + internal: + internal: true + external: + driver: bridge From 9baa229a120fc5d4dec1099f7ecc90af81391a32 Mon Sep 17 00:00:00 2001 From: Moritz Heiber Date: Tue, 29 May 2018 09:20:17 +0200 Subject: [PATCH 02/52] Simplified Dockerfile --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec457f905..91e37d04c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,12 +13,12 @@ RUN apk add --no-cache --virtual .build build-base autoconf imagemagick-dev libt install -m0755 -o root -g root /tmp/composer.phar /usr/bin/composer.phar && \ ln -sf /usr/bin/composer.phar /usr/bin/composer && \ mkdir -p /var/www && \ - install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed && \ - install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed/storage && \ - install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed/storage/framework && \ - install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed/storage/framework/sessions && \ - install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed/storage/framework/views && \ - install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed/storage/framework/cache && \ + install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed \ + /var/www/html/pixelfed/storage \ + /var/www/html/pixelfed/storage/framework \ + /var/www/html/pixelfed/storage/framework/sessions \ + /var/www/html/pixelfed/storage/framework/views \ + /var/www/html/pixelfed/storage/framework/cache && \ rm /tmp/composer.phar && \ apk del --purge .build From 32d54ecf658c9f0440fdffdb253743f185e99d18 Mon Sep 17 00:00:00 2001 From: Moritz Heiber Date: Tue, 29 May 2018 10:25:25 +0200 Subject: [PATCH 03/52] Fixed logs location in Dockerfile, added docker-compose-running.yml for running the application --- Dockerfile | 1 + docker-compose-running.yml | 64 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 docker-compose-running.yml diff --git a/Dockerfile b/Dockerfile index 91e37d04c..bbb285efb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ RUN apk add --no-cache --virtual .build build-base autoconf imagemagick-dev libt install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed \ /var/www/html/pixelfed/storage \ /var/www/html/pixelfed/storage/framework \ + /var/www/html/pixelfed/storage/logs \ /var/www/html/pixelfed/storage/framework/sessions \ /var/www/html/pixelfed/storage/framework/views \ /var/www/html/pixelfed/storage/framework/cache && \ diff --git a/docker-compose-running.yml b/docker-compose-running.yml new file mode 100644 index 000000000..8e9ccd4c1 --- /dev/null +++ b/docker-compose-running.yml @@ -0,0 +1,64 @@ +--- +version: '3' +services: + nginx: + image: nginx:alpine + networks: + - internal + - external + ports: + - 3000:80 + volumes: + - "php-storage:/var/www/html" + - ./contrib/nginx.conf:/etc/nginx/conf.d/default.conf + depends_on: + - php + + php: + build: . + image: pixelfed + volumes: + - "php-storage:/var/www/html" + networks: + - internal + environment: + - DB_HOST=mysql + - DB_DATABASE=pixelfed + - DB_USERNAME=${DB_USERNAME:-pixelfed} + - DB_PASSWORD=${DB_PASSWORD:-pixelfed} + - REDIS_HOST=redis + - APP_KEY=${APP_KEY} + env_file: + - ./.env + + mysql: + image: mysql:5.7 + networks: + - internal + environment: + - MYSQL_DATABASE=pixelfed + - MYSQL_USER=${DB_USERNAME:-pixelfed} + - MYSQL_PASSWORD=${DB_PASSWORD:-pixelfed} + - MYSQL_RANDOM_ROOT_PASSWORD="true" + env_file: + - ./.env + volumes: + - "mysql-data:/var/lib/mysql" + + redis: + image: redis:alpine + volumes: + - "redis-data:/data" + networks: + - internal + +volumes: + redis-data: + mysql-data: + php-storage: + +networks: + internal: + internal: true + external: + driver: bridge From 407095c13b72b22ce8f8e5657e88feaf28f894e7 Mon Sep 17 00:00:00 2001 From: Moritz Heiber Date: Tue, 29 May 2018 10:26:44 +0200 Subject: [PATCH 04/52] Also added the second docker-compose configuration file to dockerignore --- .dockerignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 10cb02760..e47e3356b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,7 +1,7 @@ storage data Dockerfile -docker-compose.yml +docker-compose*.yml .dockerignore .git .gitignore From 5117f003fe547968aa1fbca851190b276d6dcec2 Mon Sep 17 00:00:00 2001 From: Moritz Heiber Date: Tue, 29 May 2018 12:30:50 +0200 Subject: [PATCH 05/52] Revert the changes to the docker-compose.yml, we can merge the files later if necessary --- docker-compose.yml | 49 +++++++++++++--------------------------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b49b77a77..d9c39bd2f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,58 +3,37 @@ version: '3' services: nginx: image: nginx:alpine - networks: - - internal - - external ports: - 3000:80 volumes: - - "php-storage:/var/www/html" + - .:/var/www/html - ./contrib/nginx.conf:/etc/nginx/conf.d/default.conf depends_on: - - php - + - php php: build: . - image: pixelfed volumes: - - "php-storage:/var/www/html" - networks: - - internal + - ./storage:/var/www/html/storage + depends_on: + - mysql + - redis environment: - DB_HOST=mysql - DB_DATABASE=pixelfed - - DB_USERNAME=${DB_USERNAME:-pixelfed} - - DB_PASSWORD=${DB_PASSWORD:-pixelfed} + - DB_USERNAME=${DB_USERNAME} + - DB_PASSWORD=${DB_PASSWORD} - REDIS_HOST=redis - - APP_KEY=${APP_KEY:-app_key} - + - APP_KEY=${APP_KEY} mysql: image: mysql:5.7 - networks: - - internal environment: - MYSQL_DATABASE=pixelfed - - MYSQL_USER=${DB_USERNAME:-pixelfed} - - MYSQL_PASSWORD=${DB_PASSWORD:-pixelfed} - - MYSQL_RANDOM_ROOT_PASSWORD="true" + - MYSQL_USER=${DB_USERNAME} + - MYSQL_PASSWORD=${DB_PASSWORD} volumes: - - "mysql-data:/var/lib/mysql" - + - ./docker-volumes/mysql:/var/lib/mysql redis: image: redis:alpine volumes: - - "redis-data:/data" - networks: - - internal - -volumes: - redis-data: - mysql-data: - php-storage: - -networks: - internal: - internal: true - external: - driver: bridge + - ./docker-volumes/redis:/data +... From 1fec6737280bfc4cdb179992838e0f1ee24cedfd Mon Sep 17 00:00:00 2001 From: Moritz Heiber Date: Thu, 31 May 2018 21:43:14 +0200 Subject: [PATCH 06/52] Replaced docker-compose.yml, run composer as root, create needed directories for application storage, revert changes to nginx.conf --- Dockerfile | 25 +++++++-------- contrib/nginx.conf | 2 +- docker-compose-running.yml | 64 -------------------------------------- docker-compose.yml | 55 +++++++++++++++++++++++--------- 4 files changed, 52 insertions(+), 94 deletions(-) delete mode 100644 docker-compose-running.yml diff --git a/Dockerfile b/Dockerfile index bbb285efb..c9ee294a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,23 +12,20 @@ RUN apk add --no-cache --virtual .build build-base autoconf imagemagick-dev libt echo "${COMPOSER_CHECKSUM} /tmp/composer.phar" | sha256sum -c - && \ install -m0755 -o root -g root /tmp/composer.phar /usr/bin/composer.phar && \ ln -sf /usr/bin/composer.phar /usr/bin/composer && \ - mkdir -p /var/www && \ - install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed \ - /var/www/html/pixelfed/storage \ - /var/www/html/pixelfed/storage/framework \ - /var/www/html/pixelfed/storage/logs \ - /var/www/html/pixelfed/storage/framework/sessions \ - /var/www/html/pixelfed/storage/framework/views \ - /var/www/html/pixelfed/storage/framework/cache && \ rm /tmp/composer.phar && \ - apk del --purge .build + apk --no-cache del --purge .build -COPY --chown=www-data . /var/www/html/pixelfed/ +COPY . /var/www/html/ -WORKDIR /var/www/html/pixelfed -USER www-data -RUN composer install --prefer-source --no-interaction +WORKDIR /var/www/html +RUN install -d -m0755 -o www-data -g www-data \ + /var/www/html/storage \ + /var/www/html/storage/framework \ + /var/www/html/storage/logs \ + /var/www/html/storage/framework/sessions \ + /var/www/html/storage/framework/views \ + /var/www/html/storage/framework/cache && \ + composer install --prefer-source --no-interaction VOLUME ["/var/www/html"] -USER root ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}" diff --git a/contrib/nginx.conf b/contrib/nginx.conf index 39cfbdf4d..c39103d5a 100644 --- a/contrib/nginx.conf +++ b/contrib/nginx.conf @@ -4,7 +4,7 @@ server { server_name localhost; index index.php index.html; - root /var/www/html/pixelfed/public; + root /var/www/html/public; location / { try_files $uri $uri/ /index.php; diff --git a/docker-compose-running.yml b/docker-compose-running.yml deleted file mode 100644 index 8e9ccd4c1..000000000 --- a/docker-compose-running.yml +++ /dev/null @@ -1,64 +0,0 @@ ---- -version: '3' -services: - nginx: - image: nginx:alpine - networks: - - internal - - external - ports: - - 3000:80 - volumes: - - "php-storage:/var/www/html" - - ./contrib/nginx.conf:/etc/nginx/conf.d/default.conf - depends_on: - - php - - php: - build: . - image: pixelfed - volumes: - - "php-storage:/var/www/html" - networks: - - internal - environment: - - DB_HOST=mysql - - DB_DATABASE=pixelfed - - DB_USERNAME=${DB_USERNAME:-pixelfed} - - DB_PASSWORD=${DB_PASSWORD:-pixelfed} - - REDIS_HOST=redis - - APP_KEY=${APP_KEY} - env_file: - - ./.env - - mysql: - image: mysql:5.7 - networks: - - internal - environment: - - MYSQL_DATABASE=pixelfed - - MYSQL_USER=${DB_USERNAME:-pixelfed} - - MYSQL_PASSWORD=${DB_PASSWORD:-pixelfed} - - MYSQL_RANDOM_ROOT_PASSWORD="true" - env_file: - - ./.env - volumes: - - "mysql-data:/var/lib/mysql" - - redis: - image: redis:alpine - volumes: - - "redis-data:/data" - networks: - - internal - -volumes: - redis-data: - mysql-data: - php-storage: - -networks: - internal: - internal: true - external: - driver: bridge diff --git a/docker-compose.yml b/docker-compose.yml index d9c39bd2f..8e9ccd4c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,37 +3,62 @@ version: '3' services: nginx: image: nginx:alpine + networks: + - internal + - external ports: - - 3000:80 + - 3000:80 volumes: - - .:/var/www/html - - ./contrib/nginx.conf:/etc/nginx/conf.d/default.conf + - "php-storage:/var/www/html" + - ./contrib/nginx.conf:/etc/nginx/conf.d/default.conf depends_on: - - php + - php + php: build: . + image: pixelfed volumes: - - ./storage:/var/www/html/storage - depends_on: - - mysql - - redis + - "php-storage:/var/www/html" + networks: + - internal environment: - DB_HOST=mysql - DB_DATABASE=pixelfed - - DB_USERNAME=${DB_USERNAME} - - DB_PASSWORD=${DB_PASSWORD} + - DB_USERNAME=${DB_USERNAME:-pixelfed} + - DB_PASSWORD=${DB_PASSWORD:-pixelfed} - REDIS_HOST=redis - APP_KEY=${APP_KEY} + env_file: + - ./.env + mysql: image: mysql:5.7 + networks: + - internal environment: - MYSQL_DATABASE=pixelfed - - MYSQL_USER=${DB_USERNAME} - - MYSQL_PASSWORD=${DB_PASSWORD} + - MYSQL_USER=${DB_USERNAME:-pixelfed} + - MYSQL_PASSWORD=${DB_PASSWORD:-pixelfed} + - MYSQL_RANDOM_ROOT_PASSWORD="true" + env_file: + - ./.env volumes: - - ./docker-volumes/mysql:/var/lib/mysql + - "mysql-data:/var/lib/mysql" + redis: image: redis:alpine volumes: - - ./docker-volumes/redis:/data -... + - "redis-data:/data" + networks: + - internal + +volumes: + redis-data: + mysql-data: + php-storage: + +networks: + internal: + internal: true + external: + driver: bridge From b240ae3b4437c35bde70773b2ff4d0b690388570 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 06:14:49 +0200 Subject: [PATCH 07/52] Add css for changes in user's profile --- resources/assets/sass/custom.scss | 46 +++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index e84a5dac5..dd208eb05 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -105,3 +105,49 @@ body, button, input, textarea { .notification-page .list-group-item:first-child { border-top: none; } + +.nav-topbar { + border-top: 1px solid $gray-300; +} +.nav-topbar .nav-item { + margin: -1px 1.5rem 0; +} +.nav-topbar .nav-link { + border: 1px solid transparent; + color: $gray-300; + padding: 0.75rem 0; +} +.nav-topbar .nav-link:focus, .nav-topbar .nav-link:hover { + border-top-color: $gray-300; +} +.nav-topbar .nav-link.disabled { + color: $gray-300; + background-color: transparent; + border-color: transparent; +} +.nav-topbar .nav-item.show .nav-link, .nav-topbar .nav-link.active { + color: $gray-600; + border-top-color: $gray-600; +} +.nav-topbar .dropdown-menu { + margin-top:-1px; +} + +.info-overlay { + position: relative; +} + +.info-overlay .info-overlay-text { + display: none; + position: absolute; +} + +.info-overlay:hover .info-overlay-text { + display: flex; +} + +.info-overlay-text { + width: 100%; + height: 100%; + background-color: rgba(0,0,0,0.5); +} From 3550c0b94c284eaf1958f157d149d9bdc68a4294 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 06:22:43 +0200 Subject: [PATCH 08/52] Add lower weight option --- 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 dd208eb05..a145f48dd 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -151,3 +151,7 @@ body, button, input, textarea { height: 100%; background-color: rgba(0,0,0,0.5); } + +.font-weight-ultralight { + font-weight: 200 !important; +} From 2c190ba934e918a212dadeb1f76ee9514e166c27 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 06:25:12 +0200 Subject: [PATCH 09/52] Use new classes from stylesheet --- resources/views/profile/show.blade.php | 28 ++++++++++++++++---------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index bb6d57a65..f81e96dbb 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -4,19 +4,19 @@
-
-
-
+
+
+
-
+
- {{$user->username}} + {{$user->username}} @if($owner == true) - - Settings + + @elseif ($following == true) @@ -80,8 +80,8 @@
@if($owner == true)
-
-@endsection \ No newline at end of file +@endsection From 1b12cc2295680b970abaa69b6c1fb6a5864b3d8c Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 06:32:19 +0200 Subject: [PATCH 10/52] Replicate improvements from show --- resources/views/profile/followers.blade.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/profile/followers.blade.php b/resources/views/profile/followers.blade.php index 58e79a3b4..75ff0e939 100644 --- a/resources/views/profile/followers.blade.php +++ b/resources/views/profile/followers.blade.php @@ -4,16 +4,16 @@
-
-
-
+
+
+
-
+
-
- {{$profile->username}} +
+ {{$profile->username}}
From 2d008ea2eecd340a8f76ffb261194512971d48f5 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 06:33:15 +0200 Subject: [PATCH 11/52] Replicate improvements from show --- resources/views/profile/following.blade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/profile/following.blade.php b/resources/views/profile/following.blade.php index f04ca85e4..27aae9eca 100644 --- a/resources/views/profile/following.blade.php +++ b/resources/views/profile/following.blade.php @@ -4,16 +4,16 @@
-
-
-
+
+
+
-
+
- {{$profile->username}} + {{$profile->username}}
From b437b627802fcba7800e22569b47a20d645a21d2 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 2 Jun 2018 15:29:33 -0600 Subject: [PATCH 12/52] Update Image class, remove PNG -> JPEG conversion and use orientate() method to detect proper orientation in Exif --- app/Util/Media/Image.php | 41 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/app/Util/Media/Image.php b/app/Util/Media/Image.php index a7d53d34a..db7641fd3 100644 --- a/app/Util/Media/Image.php +++ b/app/Util/Media/Image.php @@ -105,42 +105,25 @@ class Image { $orientation = $ratio['orientation']; try { - $img = Intervention::make($file); + $img = Intervention::make($file)->orientate(); $img->resize($aspect['width'], $aspect['height'], function ($constraint) { $constraint->aspectRatio(); }); - $converted = $this->convertPngToJpeg($path, $thumbnail, $img->extension); + $converted = $this->setBaseName($path, $thumbnail, $img->extension); $newPath = storage_path('app/'.$converted['path']); - $is_png = false; - - if($img->extension == 'png' || $converted['png'] == true) { - \Log::info('PNG detected, ' . json_encode([$img, $converted])); - $is_png = true; - $newPath = str_replace('.png', '.jpeg', $newPath); - $img->encode('jpg', 80)->save($newPath); - if(!$thumbnail) { - @unlink($file); - } - \Log::info('PNG SAVED, ' . json_encode([$img, $newPath])); - } else { - \Log::info('PNG not detected, ' . json_encode([$img, $converted])); - $img->save($newPath, 75); - } + + $img->save($newPath, 75); if(!$thumbnail) { $media->orientation = $orientation; } - if($is_png == true) { - if($thumbnail == false) { + if($thumbnail == true) { + $media->thumbnail_path = $converted['path']; + $media->thumbnail_url = url(Storage::url($converted['path'])); + } else { $media->media_path = $converted['path']; $media->mime = $img->mime; - } - } - - if($thumbnail == true) { - $media->thumbnail_path = $converted['path']; - $media->thumbnail_url = url(Storage::url($converted['path'])); } $media->save(); @@ -150,18 +133,14 @@ class Image { } } - public function convertPngToJpeg($basePath, $thumbnail = false, $extension) + public function setBaseName($basePath, $thumbnail = false, $extension) { $png = false; $path = explode('.', $basePath); $name = ($thumbnail == true) ? $path[0] . '_thumb' : $path[0]; $ext = last($path); $basePath = "{$name}.{$ext}"; - if($extension == 'png' || $ext == 'png') { - $ext = 'jpeg'; - $basePath = "{$name}.{$ext}"; - $png = true; - } + return ['path' => $basePath, 'png' => $png]; } From c53e9635370f377bf592f8b199544f1a9e472b01 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 2 Jun 2018 16:53:35 -0600 Subject: [PATCH 13/52] Add supported file types and max caption length to new post form. Closes #121 and #136 --- app/Http/Controllers/StatusController.php | 4 ++-- app/Providers/AppServiceProvider.php | 6 ++++- app/Util/Lexer/PrettyNumber.php | 16 +++++++++++++ config/pixelfed.php | 20 ++++++++++++++++ .../views/timeline/partial/new-form.blade.php | 23 +++++++++++++++++++ resources/views/timeline/personal.blade.php | 19 ++------------- resources/views/timeline/public.blade.php | 19 ++------------- 7 files changed, 70 insertions(+), 37 deletions(-) create mode 100644 resources/views/timeline/partial/new-form.blade.php diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php index 0220b6d0f..317baf0b0 100644 --- a/app/Http/Controllers/StatusController.php +++ b/app/Http/Controllers/StatusController.php @@ -30,8 +30,8 @@ class StatusController extends Controller $user = Auth::user(); $this->validate($request, [ - 'photo' => 'required|image|max:15000', - 'caption' => 'string|max:150' + 'photo' => 'required|mimes:jpeg,png,bmp,gif|max:' . config('pixelfed.max_photo_size'), + 'caption' => 'string|max:' . config('pixelfed.max_caption_length') ]); $monthHash = hash('sha1', date('Y') . date('m')); diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 60c2aec65..8a21a2a7d 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -40,7 +40,6 @@ class AppServiceProvider extends ServiceProvider }); Blade::directive('prettySize', function($expression) { - $size = intval($expression); $precision = 0; $short = true; @@ -51,6 +50,11 @@ class AppServiceProvider extends ServiceProvider $res = round($size, $precision).$units[$i]; return ""; }); + + Blade::directive('maxFileSize', function() { + $value = config('pixelfed.max_photo_size'); + return \App\Util\Lexer\PrettyNumber::size($value, true); + }); } /** diff --git a/app/Util/Lexer/PrettyNumber.php b/app/Util/Lexer/PrettyNumber.php index 80227f6fe..23d7ab267 100644 --- a/app/Util/Lexer/PrettyNumber.php +++ b/app/Util/Lexer/PrettyNumber.php @@ -17,4 +17,20 @@ class PrettyNumber { return $expression; } + public static function size($expression, $kb = false) + { + if($kb) { + $expression = $expression * 1024; + } + $size = intval($expression); + $precision = 0; + $short = true; + $units = $short ? + ['B','k','M','G','T','P','E','Z','Y'] : + ['B','kB','MB','GB','TB','PB','EB','ZB','YB']; + for($i = 0; ($size / 1024) > 0.9; $i++, $size /= 1024) {} + $res = round($size, $precision).$units[$i]; + return $res; + } + } \ No newline at end of file diff --git a/config/pixelfed.php b/config/pixelfed.php index 9c33a56cf..9a872e74c 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -76,5 +76,25 @@ return [ 'remote_follow_enabled' => env('REMOTE_FOLLOW', false), 'activitypub_enabled' => env('ACTIVITY_PUB', false), + + /* + |-------------------------------------------------------------------------- + | Photo file size limit + |-------------------------------------------------------------------------- + | + | Update the max photo size, in KB. + | + */ + 'max_photo_size' => env('MAX_PHOTO_SIZE', 15000), + + /* + |-------------------------------------------------------------------------- + | Caption limit + |-------------------------------------------------------------------------- + | + | Change the caption length limit for new local posts. + | + */ + 'max_caption_length' => env('MAX_CAPTION_LENGTH', 150), ]; \ No newline at end of file diff --git a/resources/views/timeline/partial/new-form.blade.php b/resources/views/timeline/partial/new-form.blade.php new file mode 100644 index 000000000..104e4de57 --- /dev/null +++ b/resources/views/timeline/partial/new-form.blade.php @@ -0,0 +1,23 @@ +
+
New Post
+
+
+ @csrf +
+ + + + Max Size: @maxFileSize(). Supported formats: jpeg, png, gif, bmp. + +
+
+ + + + Max length: {{config('pixelfed.max_caption_length')}} characters. + +
+ +
+
+
\ No newline at end of file diff --git a/resources/views/timeline/personal.blade.php b/resources/views/timeline/personal.blade.php index b10490638..ce9415638 100644 --- a/resources/views/timeline/personal.blade.php +++ b/resources/views/timeline/personal.blade.php @@ -17,24 +17,9 @@
@endif -
-
New Post
-
-
- @csrf -
- - -
-
- - -
- -
-
-
+ @include('timeline.partial.new-form') +
@foreach($timeline as $item) diff --git a/resources/views/timeline/public.blade.php b/resources/views/timeline/public.blade.php index 7f5d9afd2..e5b814f1a 100644 --- a/resources/views/timeline/public.blade.php +++ b/resources/views/timeline/public.blade.php @@ -17,23 +17,8 @@
@endif -
-
New Post
-
-
- @csrf -
- - -
-
- - -
- -
-
-
+ + @include('timeline.partial.new-form')
@foreach($timeline as $item) From 35020b71084f39e170947cc92e7dc86a266533ca Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 01:47:06 +0200 Subject: [PATCH 14/52] Update look of status view --- resources/views/status/show.blade.php | 129 +++++++++++++------------- 1 file changed, 63 insertions(+), 66 deletions(-) diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index 7c882def9..54d9ae030 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -2,86 +2,83 @@ @section('content') -
-
- -
-
-
-
- +
+
+
+
+ +
+
+
+
+
+ +
+
+ {{$user->username}} +
-
-
-
- -
-
- {{$user->username}} -
-
-
-
-
- {{$status->profile->username}} -

- {!! $status->rendered ?? e($status->caption) !!} -

-
+
+

{{$status->created_at->diffForHumans()}}

+
+
+
+
+
+

+ {{$status->profile->username}} + {!! $status->rendered ?? e($status->caption) !!} +

+
@foreach($status->comments->reverse()->take(10) as $item) -

- {{$item->profile->username}} - {!!$item->rendered!!} {{$item->created_at->diffForHumans(null, true, true ,true)}} -

+

+ {{$item->profile->username}} + {!!$item->rendered!!} {{$item->created_at->diffForHumans(null, true, true ,true)}} +

@endforeach -
-
-
-
-
+
+
+
+ @csrf - + - - @if(Auth::check()) - @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true) -
- @csrf - - - -
- @endif - @endif - -
- @csrf - - -
- -
- -
-

{{$status->created_at->diffForHumans()}}

-
-
-
-
+ + @if(Auth::check()) + @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true) + + @csrf + + + +
+ @endif + @endif + +
@csrf - +
-
+
+ +
+
+
+ @csrf + + +
-@endsection \ No newline at end of file +@endsection From c4b9cc9eda1588e9787731e7a57b479bafab4b2d Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 01:52:50 +0200 Subject: [PATCH 15/52] Remove useless hr --- resources/views/status/show.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index 54d9ae030..7e6ddc5dd 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -22,7 +22,6 @@

{{$status->created_at->diffForHumans()}}

-

From 0440f8ba720e8eab4235d1ba326c9b48d7e7c665 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 01:53:54 +0200 Subject: [PATCH 16/52] Fix #90 --- resources/assets/sass/custom.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index e84a5dac5..01bb1eda9 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -56,9 +56,7 @@ body, button, input, textarea { } .card.status-container .status-photo { - display: -webkit-box !important; - display: -ms-flexbox !important; - display: flex !important; + display: block !important; margin: auto !important; } From 66f285c2b1dca7eebfa10d684e98b23a63b04018 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 03:25:29 +0200 Subject: [PATCH 17/52] Add supporting classes to square based layout --- resources/views/profile/show.blade.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index f81e96dbb..8894cccab 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -101,12 +101,14 @@ @foreach($timeline as $status)

- -
-
- {{$item->likes()->count()}} - {{$item->comments()->count()}} -
+
+
+
+
+ {{$item->likes()->count()}} + {{$item->comments()->count()}} +
+
From ea119a28ed36a3861467bc9e82cd6e2cf0b62e09 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 03:28:58 +0200 Subject: [PATCH 18/52] Add CSS for added classes --- resources/assets/sass/custom.scss | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index bc24a07ed..a972f29d1 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -153,3 +153,23 @@ body, button, input, textarea { .font-weight-ultralight { font-weight: 200 !important; } + +.square { + position: relative; + width: 100%; +} + +.square::after { + content: ""; + display: block; + padding-bottom: 100%; +} + +.square-content { + position: absolute; + width: 100%; + height: 100%; + background-repeat: no-repeat; + background-size: cover; + background-position: 50%; +} From c36aeba532d8b9909d5db7e687197cc95b51e652 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 2 Jun 2018 19:41:27 -0600 Subject: [PATCH 19/52] Fix profile blade variables --- resources/views/profile/show.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index 8894cccab..7b691517f 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -105,8 +105,8 @@
- {{$item->likes()->count()}} - {{$item->comments()->count()}} + {{$status->likes()->count()}} + {{$status->comments()->count()}}
From 333577c240a25286c612790acee7fb9898e24bc7 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 2 Jun 2018 19:41:53 -0600 Subject: [PATCH 20/52] Update compiled assets --- public/css/app.css | Bin 157579 -> 158641 bytes public/mix-manifest.json | Bin 184 -> 184 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 86c947d07c3d10146b939c3ab01a4cd0dd01970f..2da738eaa3442eff712d66652fdc524534c26756 100644 GIT binary patch delta 674 zcmZut&ubGw80AaRT0{ya*k)^FB}8mt)=gj=neD-Yo;*ke@10~O*`d2L>tvEvmxT!4 zytL#n;KBbv5Q3nHC&5ec)QboGCp?>Ml9Gkqz8~*xt0BISwh%&#%P-&)16FaN9W>FFm)#U=CdVFlx9Z#{yc9)^1T88^OZ5c|1 ztCX<@+x25YDHmPrG%vxQmSLlm>CRL_E)H=Z2h1D4Exki1G_+2fi^ffWmh<^z`B+c`AS>{ut1_u|PZ7E&DqL>+efXe!!!=$5`N=B!@i{`V08@EwQYAvHoYyq0&Dl`+?e18H(^ZX}l on)d+rsy+Ui;r28%zeU=IT_yX1qKoi6x0a6noZlM9w6L}EA52K^ZU6uP delta 39 xcmV+?0NDSr*9nWy34nwFv;y{Elj@KQmoLNtKeq*80vZFCqG$pZx0YxE8v{?p4zd6M diff --git a/public/mix-manifest.json b/public/mix-manifest.json index eb8b185763e456730c6dcac9cfdb183670f3205e..7d075bc34ac918703825ec142db010309796cbf8 100644 GIT binary patch delta 30 lcmdnNxPx&*yhxgbNt%g)VQP}8xsjn+s Date: Sat, 2 Jun 2018 20:22:44 -0600 Subject: [PATCH 21/52] Add padding to overlay --- resources/views/profile/show.blade.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index 7b691517f..ca7166401 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -104,9 +104,13 @@
-
- {{$status->likes()->count()}} - {{$status->comments()->count()}} +
+ + {{$status->likes()->count()}} + + + {{$status->comments()->count()}} +
From 3d657e0c5259c22da67c46f9e7a6e6eab427cd2e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 2 Jun 2018 20:26:49 -0600 Subject: [PATCH 22/52] Fix n+1 comment + like counts in status overlays --- app/Http/Controllers/ProfileController.php | 7 ++++++- resources/views/profile/show.blade.php | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index a9d9846c5..6777dbb49 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -32,7 +32,12 @@ class ProfileController extends Controller // TODO: refactor this mess $owner = Auth::check() && Auth::id() === $user->user_id; $following = ($owner == false && Auth::check()) ? $user->followedBy(Auth::user()->profile) : false; - $timeline = $user->statuses()->whereHas('media')->whereNull('in_reply_to_id')->orderBy('id','desc')->paginate(21); + $timeline = $user->statuses() + ->whereHas('media') + ->whereNull('in_reply_to_id') + ->orderBy('id','desc') + ->withCount(['comments', 'likes']) + ->simplePaginate(21); return view('profile.show', compact('user', 'owner', 'following', 'timeline')); } diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index ca7166401..c2206387a 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -106,10 +106,10 @@
- {{$status->likes()->count()}} + {{$status->likes_count}} - {{$status->comments()->count()}} + {{$status->comments_count}}
From 818fd765509bb422898cb4bb5899031dfac0b497 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 2 Jun 2018 21:03:37 -0600 Subject: [PATCH 23/52] Change assets to use mix() method for versioning --- resources/views/layouts/app.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index e25fe9249..58c55b131 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -14,7 +14,7 @@ - + @stack('styles') @@ -25,7 +25,7 @@
@include('layouts.partial.footer')
- + @stack('scripts') From 6c0817a5729823cc688b0b2a9f7832fe1dfef3ed Mon Sep 17 00:00:00 2001 From: trwnh Date: Sun, 3 Jun 2018 01:06:26 -0500 Subject: [PATCH 24/52] Fix #156 --- resources/assets/sass/custom.scss | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index a972f29d1..c40880736 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -61,32 +61,10 @@ body, button, input, textarea { } .card.status-container .status-comments { - height: 220px; overflow-y: scroll; border-bottom:1px solid rgba(0, 0, 0, 0.1); } -.card.status-container.orientation-square .status-comments { - height: 360px !important; -} - - -.card.status-container.orientation-portrait .status-comments { - height: 528px !important; -} - -.card.status-container.orientation-landscape .status-photo img { - max-height: 451px !important; -} - -.card.status-container.orientation-square .status-photo img { - max-height: 601px !important; -} - -.card.status-container.orientation-portrait .status-photo img { - max-height: 772px !important; -} - .no-caret.dropdown-toggle { text-decoration: none !important; } From b1a46f9b1596a865a2683c26ea8a9d4b7102c28b Mon Sep 17 00:00:00 2001 From: trwnh Date: Sun, 3 Jun 2018 01:17:27 -0500 Subject: [PATCH 25/52] Remove unnecessary block definition Default display model is already block, so need to redefine it --- resources/assets/sass/custom.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index c40880736..99ceeb8da 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -56,7 +56,6 @@ body, button, input, textarea { } .card.status-container .status-photo { - display: block !important; margin: auto !important; } From 32fa4c2e0b2f38391fd8647665a8fa9659201c8d Mon Sep 17 00:00:00 2001 From: trwnh Date: Sun, 3 Jun 2018 01:20:06 -0500 Subject: [PATCH 26/52] Singular footer margin Remove complexity and unnecessarily large gap --- resources/views/layouts/partial/footer.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/layouts/partial/footer.blade.php b/resources/views/layouts/partial/footer.blade.php index 7cc7f6551..382d513b4 100644 --- a/resources/views/layouts/partial/footer.blade.php +++ b/resources/views/layouts/partial/footer.blade.php @@ -1,6 +1,6 @@ - From 89646cf1c67092fb5ea0815dbf2b1e7199e93b26 Mon Sep 17 00:00:00 2001 From: trwnh Date: Sun, 3 Jun 2018 01:44:29 -0500 Subject: [PATCH 27/52] Offset only for md layout (followers) Fix #160 for followers list --- resources/views/profile/followers.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/profile/followers.blade.php b/resources/views/profile/followers.blade.php index 75ff0e939..59a4dc988 100644 --- a/resources/views/profile/followers.blade.php +++ b/resources/views/profile/followers.blade.php @@ -42,7 +42,7 @@
-
+
@if($followers->count() !== 0)
    @foreach($followers as $user) From 48240d319cc2a8031a7119b26dc0a33daec3ef2f Mon Sep 17 00:00:00 2001 From: trwnh Date: Sun, 3 Jun 2018 01:46:25 -0500 Subject: [PATCH 28/52] Define offset only for md layout (following) Fix #160 for following list --- resources/views/profile/following.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/profile/following.blade.php b/resources/views/profile/following.blade.php index 27aae9eca..e7909cb98 100644 --- a/resources/views/profile/following.blade.php +++ b/resources/views/profile/following.blade.php @@ -42,7 +42,7 @@
-
+
@if($following->count() !== 0)
    @foreach($following as $user) From d13f73db956e83f8f0e0bfd2d7733b896c788123 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 3 Jun 2018 00:55:05 -0600 Subject: [PATCH 29/52] Update compiled assets --- public/css/app.css | Bin 158641 -> 158172 bytes public/mix-manifest.json | Bin 184 -> 184 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 2da738eaa3442eff712d66652fdc524534c26756..9342d305f1b90a356b4da3fbca02d5aab9538604 100644 GIT binary patch delta 34 qcmdmZo%7CR&W0AoEllqcrVF|NPWf>9s)7i{WOhy3NgvfHqG~WK!8)m&g>y0RWSsi+lh8 diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 7d075bc34ac918703825ec142db010309796cbf8..7caf1148de0f5927d09421874fd236610731ab01 100644 GIT binary patch delta 30 lcmdnNxPx&*yoga^N>Ykxa!R6+iK&5!kx62rf!V}jR{)m|31$EQ delta 30 lcmdnNxPx&*yhxgbNt%g)VQP}8xsjn+s Date: Sun, 3 Jun 2018 01:00:16 -0600 Subject: [PATCH 30/52] Update status view --- resources/views/status/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index 7e6ddc5dd..b427b4847 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -19,7 +19,7 @@
-

{{$status->created_at->diffForHumans()}}

+

{{$status->created_at->diffForHumans(null, true, true, true)}}

From 6d5c8fb90a2de5532f62919393af6724b8328931 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 3 Jun 2018 01:15:38 -0600 Subject: [PATCH 31/52] Fix n+1 query in status view --- app/Http/Controllers/StatusController.php | 4 +++- resources/views/status/show.blade.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php index 317baf0b0..e1db420c8 100644 --- a/app/Http/Controllers/StatusController.php +++ b/app/Http/Controllers/StatusController.php @@ -13,7 +13,9 @@ class StatusController extends Controller public function show(Request $request, $username, int $id) { $user = Profile::whereUsername($username)->firstOrFail(); - $status = Status::whereProfileId($user->id)->findOrFail($id); + $status = Status::whereProfileId($user->id) + ->withCount('likes') + ->findOrFail($id); if(!$status->media_path && $status->in_reply_to_id) { return view('status.reply', compact('user', 'status')); } diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index b427b4847..0b0d7ab69 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -65,7 +65,7 @@
From 9e28bb6c56cafd1bdb2f6010621ce24e75d5f859 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 16:22:13 +0200 Subject: [PATCH 32/52] Don't use JS for navbar so much in mobile view And fix #174 --- resources/views/layouts/partial/nav.blade.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php index 50b481cc0..1559daf40 100644 --- a/resources/views/layouts/partial/nav.blade.php +++ b/resources/views/layouts/partial/nav.blade.php @@ -1,15 +1,12 @@ -
-
From 9952920aa70d3c572ddf54e96e6ac79937ef8704 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 3 Jun 2018 20:21:13 -0600 Subject: [PATCH 44/52] Update status template --- resources/views/status/template.blade.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/views/status/template.blade.php b/resources/views/status/template.blade.php index 271d98592..b91ac18bc 100644 --- a/resources/views/status/template.blade.php +++ b/resources/views/status/template.blade.php @@ -33,22 +33,24 @@
- - +
@csrf - +

@@ -95,7 +97,7 @@

@csrf - +
\ No newline at end of file From dfe451db70e1657b9e04f7820a51cd4eea998f68 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 3 Jun 2018 20:46:55 -0600 Subject: [PATCH 45/52] Fix like count --- app/Http/Controllers/LikeController.php | 25 ++++++---- public/js/app.js | Bin 1106852 -> 1106850 bytes public/mix-manifest.json | Bin 184 -> 184 bytes resources/assets/js/components/likebutton.js | 46 +++++++++---------- 4 files changed, 40 insertions(+), 31 deletions(-) diff --git a/app/Http/Controllers/LikeController.php b/app/Http/Controllers/LikeController.php index 932958d5e..0ca585ccc 100644 --- a/app/Http/Controllers/LikeController.php +++ b/app/Http/Controllers/LikeController.php @@ -21,21 +21,30 @@ class LikeController extends Controller ]); $profile = Auth::user()->profile; - $status = Status::findOrFail($request->input('item')); + $status = Status::withCount('likes')->findOrFail($request->input('item')); + + $count = $status->likes_count; if($status->likes()->whereProfileId($profile->id)->count() !== 0) { $like = Like::whereProfileId($profile->id)->whereStatusId($status->id)->firstOrFail(); $like->delete(); - return redirect()->back(); + $count--; + } else { + $like = new Like; + $like->profile_id = $profile->id; + $like->status_id = $status->id; + $like->save(); + $count++; } - $like = new Like; - $like->profile_id = $profile->id; - $like->status_id = $status->id; - $like->save(); - LikePipeline::dispatch($like); - return redirect($status->url()); + if($request->ajax()) { + $response = ['code' => 200, 'msg' => 'Like saved', 'count' => $count]; + } else { + $response = redirect($status->url()); + } + + return $response; } } diff --git a/public/js/app.js b/public/js/app.js index 92bd710827da780dbb7608f42f89ba24ddb0fb53..4160ff4b104f01d458155bd758caa0c9df814005 100644 GIT binary patch delta 129 zcmV-{0Dk|Z$3vpWLx6+5Db#8Q*OWzQQm*L+KSeHHE5MZ~P;1CG|5il^N delta 145 zcmV;C0B--H$3vvYLx6+ -1) { - heart.addClass('far fa-heart').removeClass('fas fa-heart'); - likes = likes.filter(function(item) { - return item !== id - }); - count = count == 0 ? 0 : count--; - counter.text(count); - action = 'unlike'; - } else { - heart.addClass('fas fa-heart').removeClass('far fa-heart'); - likes.push(id); - count++; - counter.text(count); - action = 'like'; - } + if(likes.indexOf(id) > -1) { + heart.addClass('far fa-heart').removeClass('fas fa-heart'); + likes = likes.filter(function(item) { + return item !== id + }); + counter.text(count); + action = 'unlike'; + } else { + heart.addClass('fas fa-heart').removeClass('far fa-heart'); + likes.push(id); + counter.text(count); + action = 'like'; + } - ls.set('likes', likes); - console.log(action + ' - ' + $(this).data('id') + ' like event'); + ls.set('likes', likes); + console.log(action + ' - ' + $(this).data('id') + ' like event'); + }); }); }); \ No newline at end of file From 4751832ad3742e55d5e5e77e853c9c14b176ebcd Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 3 Jun 2018 21:04:01 -0600 Subject: [PATCH 46/52] Fix pagination bug for like and comment events --- app/Http/Controllers/ApiController.php | 4 ++-- public/js/app.js | Bin 1106850 -> 1106953 bytes public/js/timeline.js | Bin 709 -> 763 bytes public/mix-manifest.json | Bin 184 -> 184 bytes resources/assets/js/bootstrap.js | 1 + resources/assets/js/components/commentform.js | 2 +- resources/assets/js/components/likebutton.js | 9 +++++---- resources/assets/js/timeline.js | 3 +++ 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 1b52e28f2..a596346bc 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -24,9 +24,9 @@ class ApiController extends Controller $likes = Like::whereProfileId($profile->id) ->orderBy('id', 'desc') - ->take(100) + ->take(1000) ->pluck('status_id'); - + return response()->json($likes); } } diff --git a/public/js/app.js b/public/js/app.js index 4160ff4b104f01d458155bd758caa0c9df814005..a7820a8a8c91a840606702bd7c8e98965de8ff91 100644 GIT binary patch delta 304 zcmZ2<+`03FbHf(K+24&)@{>z*Q}aqR_44yHl!{A}ax+Vmbd>ax^K(JMx@q}Exk@@| zrFqFEnLrgKI;oQ<6o|B6{?54l@^>b?&pZX06{$ICsVTPAwL0xwubF|E1&CRJm<@>8 zftUk`If0l9h`E872Z(urm~T7RYkreY(_QWg^q9lU(aWezDM~C!^~uamEw+VQtXW-_ zSfo&5n^UZpo?4=zlmn7h(zKrb=&pb|SDvj#vaO0nvZm&A;d=rFcC|WKjnmN7QPIHV bV~~ju?@mAO%OpSD_X{K6_T%>iZnFRYEHZQ% delta 163 zcmeA?;k@X$bHf(K+21*p^pf*)b5rw5rYn45lx#o!opJl=?@S?|+l^i`12GE_vjQ<2 z5VHd@2M}`tF&7YX12GQ}^8zv7cB9w)x}Vs}5{nc{tf$A{73dKvvCS#gOHVD)P|C^7 xPAyi_)S0eyPe7eD*;Yj(dHTEWj8fAx?g>P5>ZoWa>4B7hoM63O@4moo764z_LBs$6 diff --git a/public/js/timeline.js b/public/js/timeline.js index fde930740d02785c60b37cea4fbee031d1bb0b07..548ff63d5fe390367b675cb6a4c24cd9efb28fc8 100644 GIT binary patch delta 68 zcmX@g`kQsbekL2e{5%b%#Daprfl1!jTs!pCxiDq>{W<_dFT55`3MrBG- UVo9n`W_D_^hGs1Y)@oV<0BJ!O#{d8T delta 14 Vcmey(dX#m;ekQhB&DvT`YXB_(1x5e> diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 9ec6355273bd68d4733621d438a98427a91289d2..c58ecdb81f8f82bfc42e8fe83215e03e22fd37d8 100644 GIT binary patch delta 54 zcmdnNxPx(mvWQW#S+a$JWum!Znu&3;v2jX@Nzz2~EOEoclvE3&#FUieWJ6QqRFkwc JGczTwS^&6R57qzx delta 54 zcmdnNxPx(mvWSVfMQUPlvY~mRL29B|T2i91q2)yLEb+ADWDB!IOA|xOBxB=53nRm1 JBV#45S^&Tg4|D(k diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index 6db7d4c98..e7da88eff 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -9,6 +9,7 @@ window.Popper = require('popper.js').default; */ try { + window.pixelfed = {}; window.$ = window.jQuery = require('jquery'); require('bootstrap'); window.InfiniteScroll = require('infinite-scroll'); diff --git a/resources/assets/js/components/commentform.js b/resources/assets/js/components/commentform.js index c7de6b42e..159a91531 100644 --- a/resources/assets/js/components/commentform.js +++ b/resources/assets/js/components/commentform.js @@ -5,7 +5,7 @@ $(document).ready(function() { el.focus(); }); - $('.comment-form').submit(function(e, data) { + $(document).on('submit', '.comment-form', function(e, data) { e.preventDefault(); let el = $(this); diff --git a/resources/assets/js/components/likebutton.js b/resources/assets/js/components/likebutton.js index 9ea111ac8..4283fcf1d 100644 --- a/resources/assets/js/components/likebutton.js +++ b/resources/assets/js/components/likebutton.js @@ -11,9 +11,8 @@ $(document).ready(function() { }) } - hydrateLikes(); - function hydrateLikes() { + pixelfed.hydrateLikes = function() { var likes = ls.get('likes'); $('.like-form').each(function(i, el) { var el = $(el); @@ -24,9 +23,11 @@ $(document).ready(function() { heart.addClass('fas fa-heart').removeClass('far fa-heart'); } }); - } + }; - $('.like-form').submit(function(e) { + pixelfed.hydrateLikes(); + + $(document).on('submit', '.like-form', function(e) { e.preventDefault(); var el = $(this); var id = el.data('id'); diff --git a/resources/assets/js/timeline.js b/resources/assets/js/timeline.js index 02ffbb239..576b3e71e 100644 --- a/resources/assets/js/timeline.js +++ b/resources/assets/js/timeline.js @@ -6,4 +6,7 @@ $(document).ready(function() { append: '.timeline-feed', history: false, }); + infScroll.on( 'append', function( response, path, items ) { + pixelfed.hydrateLikes(); + }); }); \ No newline at end of file From e88777ed57b64b4bace4d7911b91b15d24461f69 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 3 Jun 2018 21:38:29 -0600 Subject: [PATCH 47/52] Add self posts to personal timeline Closes #85 --- app/Http/Controllers/TimelineController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/TimelineController.php b/app/Http/Controllers/TimelineController.php index 8b6eaf7bf..c49b98b3b 100644 --- a/app/Http/Controllers/TimelineController.php +++ b/app/Http/Controllers/TimelineController.php @@ -17,6 +17,7 @@ class TimelineController extends Controller { // TODO: Use redis for timelines $following = Follower::whereProfileId(Auth::user()->profile->id)->pluck('following_id'); + $following->push(Auth::user()->profile->id); $timeline = Status::whereHas('media') ->whereNull('in_reply_to_id') ->whereIn('profile_id', $following) From aaf94d56ccf72c52d2ff21f777c5e23ab4125c52 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 3 Jun 2018 23:40:17 -0600 Subject: [PATCH 48/52] Fix comment timeline bug --- public/js/app.js | Bin 1106953 -> 1106936 bytes public/mix-manifest.json | Bin 184 -> 184 bytes resources/assets/js/components/commentform.js | 2 +- resources/assets/js/components/likebutton.js | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/js/app.js b/public/js/app.js index a7820a8a8c91a840606702bd7c8e98965de8ff91..e32bd8ddc659984d87cb81d0e6400b46089dd228 100644 GIT binary patch delta 91 zcmeA?;r!#cbHf%!mYt}zB6*P^ZaB4VkRJF24WTr wFA(!>=lRLs_Y7>r_C@yvEEt7UG)giui#7F95=#;_lrmG4G`HV=ARx;O0M8yRuK)l5 diff --git a/public/mix-manifest.json b/public/mix-manifest.json index c58ecdb81f8f82bfc42e8fe83215e03e22fd37d8..7b6dca63ce077e97e893a0ff4b18c02e52c38543 100644 GIT binary patch delta 30 lcmdnNxPx(mvWRh_K}wowvUyr!YO+~MT8f#WN%BPVMgWz%3DE!m delta 30 lcmdnNxPx(mvWQW#S+a$JWum!Znu&3;v2jX@Nzz2~MgWPm2@e1O diff --git a/resources/assets/js/components/commentform.js b/resources/assets/js/components/commentform.js index 159a91531..a0b56332c 100644 --- a/resources/assets/js/components/commentform.js +++ b/resources/assets/js/components/commentform.js @@ -24,7 +24,7 @@ $(document).ready(function() { if($('.status-container').length == 1) { var comments = el.parents().eq(3).find('.comments'); } else { - var comments = el.parents().eq(2).find('.comments'); + var comments = el.parents().eq(1).find('.comments'); } var comment = '

' + username + ''+ commenttext + '1s

'; diff --git a/resources/assets/js/components/likebutton.js b/resources/assets/js/components/likebutton.js index 4283fcf1d..1de310f7f 100644 --- a/resources/assets/js/components/likebutton.js +++ b/resources/assets/js/components/likebutton.js @@ -35,7 +35,7 @@ $(document).ready(function() { .then(function (res) { var likes = ls.get('likes'); var action = false; - var counter = el.parents().eq(2).find('.like-count'); + var counter = el.parents().eq(1).find('.like-count'); var count = res.data.count; var heart = el.find('.status-heart'); @@ -54,7 +54,7 @@ $(document).ready(function() { } ls.set('likes', likes); - console.log(action + ' - ' + $(this).data('id') + ' like event'); + console.log(action + ' - ' + id + ' like event'); }); }); }); \ No newline at end of file From 2a731505869c48f2a3bad7e896f3725104de770e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 4 Jun 2018 00:07:40 -0600 Subject: [PATCH 49/52] Update comment url structure --- app/Http/Controllers/CommentController.php | 4 ++-- app/Http/Controllers/StatusController.php | 2 +- app/Status.php | 7 ++++++- routes/web.php | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php index b6851442e..1815914c3 100644 --- a/app/Http/Controllers/CommentController.php +++ b/app/Http/Controllers/CommentController.php @@ -10,10 +10,10 @@ use App\{Comment, Profile, Status}; class CommentController extends Controller { - public function show(Request $request, $username, int $id) + public function show(Request $request, $username, int $id, int $cid) { $user = Profile::whereUsername($username)->firstOrFail(); - $status = Status::whereProfileId($user->id)->whereNotNull('in_reply_to_id')->findOrFail($id); + $status = Status::whereProfileId($user->id)->whereInReplyToId($id)->findOrFail($cid); return view('status.reply', compact('user', 'status')); } diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php index e1db420c8..d687b6bdf 100644 --- a/app/Http/Controllers/StatusController.php +++ b/app/Http/Controllers/StatusController.php @@ -17,7 +17,7 @@ class StatusController extends Controller ->withCount('likes') ->findOrFail($id); if(!$status->media_path && $status->in_reply_to_id) { - return view('status.reply', compact('user', 'status')); + return redirect($status->url()); } return view('status.show', compact('user', 'status')); } diff --git a/app/Status.php b/app/Status.php index aa1146280..3bf4fc9ca 100644 --- a/app/Status.php +++ b/app/Status.php @@ -32,7 +32,12 @@ class Status extends Model { $id = $this->id; $username = $this->profile->username; - return url(config('app.url') . "/p/{$username}/{$id}"); + $path = config('app.url') . "/p/{$username}/{$id}"; + if(!is_null($this->in_reply_to_id)) { + $pid = $this->in_reply_to_id; + $path = config('app.url') . "/p/{$username}/{$pid}/c/{$id}"; + } + return url($path); } public function mediaUrl() diff --git a/routes/web.php b/routes/web.php index adc8f74c9..bac723e7d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -125,6 +125,7 @@ Route::domain(config('pixelfed.domain.app'))->group(function() { Route::view('libraries', 'site.libraries')->name('site.libraries'); }); + Route::get('p/{username}/{id}/c/{cid}', 'CommentController@show'); Route::get('p/{username}/{id}', 'StatusController@show'); Route::get('{username}/saved', 'ProfileController@savedBookmarks'); Route::get('{username}/followers', 'ProfileController@followers'); From 059791c6af31d4e1bc790b3c0d34844591166ed3 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 4 Jun 2018 00:41:23 -0600 Subject: [PATCH 50/52] Add dbal dependency Run `composer update` if you run an instance already! --- composer.json | 1 + composer.lock | 359 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 359 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 17f6b01d6..12cc30932 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "php": "^7.1.3", "99designs/http-signatures-guzzlehttp": "^2.0", "bitverse/identicon": "^1.1", + "doctrine/dbal": "^2.7", "fideloper/proxy": "^4.0", "greggilbert/recaptcha": "dev-master", "intervention/image": "^2.4", diff --git a/composer.lock b/composer.lock index 879680005..db0c2e817 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7be7e27683f56b7ec28eeef962cf2437", + "content-hash": "bb2590c6fbf5fbc46642f6cbccf7969f", "packages": [ { "name": "99designs/http-signatures", @@ -244,6 +244,363 @@ "description": "implementation of xdg base directory specification for php", "time": "2014-10-24T07:27:01+00:00" }, + { + "name": "doctrine/annotations", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/annotations.git", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "shasum": "" + }, + "require": { + "doctrine/lexer": "1.*", + "php": "^7.1" + }, + "require-dev": { + "doctrine/cache": "1.*", + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Docblock Annotations Parser", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "annotations", + "docblock", + "parser" + ], + "time": "2017-12-06T07:11:42+00:00" + }, + { + "name": "doctrine/cache", + "version": "v1.7.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/cache.git", + "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a", + "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a", + "shasum": "" + }, + "require": { + "php": "~7.1" + }, + "conflict": { + "doctrine/common": ">2.2,<2.4" + }, + "require-dev": { + "alcaeus/mongo-php-adapter": "^1.1", + "mongodb/mongodb": "^1.1", + "phpunit/phpunit": "^5.7", + "predis/predis": "~1.0" + }, + "suggest": { + "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Caching library offering an object-oriented API for many cache backends", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "cache", + "caching" + ], + "time": "2017-08-25T07:02:50+00:00" + }, + { + "name": "doctrine/collections", + "version": "v1.5.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/collections.git", + "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf", + "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "doctrine/coding-standard": "~0.1@dev", + "phpunit/phpunit": "^5.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Collections\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Collections Abstraction library", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "array", + "collections", + "iterator" + ], + "time": "2017-07-22T10:37:32+00:00" + }, + { + "name": "doctrine/common", + "version": "v2.8.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/common.git", + "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/common/zipball/f68c297ce6455e8fd794aa8ffaf9fa458f6ade66", + "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66", + "shasum": "" + }, + "require": { + "doctrine/annotations": "1.*", + "doctrine/cache": "1.*", + "doctrine/collections": "1.*", + "doctrine/inflector": "1.*", + "doctrine/lexer": "1.*", + "php": "~7.1" + }, + "require-dev": { + "phpunit/phpunit": "^5.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\": "lib/Doctrine/Common" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Common Library for Doctrine projects", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "annotations", + "collections", + "eventmanager", + "persistence", + "spl" + ], + "time": "2017-08-31T08:43:38+00:00" + }, + { + "name": "doctrine/dbal", + "version": "v2.7.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/dbal.git", + "reference": "11037b4352c008373561dc6fc836834eed80c3b5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/11037b4352c008373561dc6fc836834eed80c3b5", + "reference": "11037b4352c008373561dc6fc836834eed80c3b5", + "shasum": "" + }, + "require": { + "doctrine/common": "^2.7.1", + "ext-pdo": "*", + "php": "^7.1" + }, + "require-dev": { + "doctrine/coding-standard": "^4.0", + "phpunit/phpunit": "^7.0", + "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5", + "symfony/console": "^2.0.5||^3.0", + "symfony/phpunit-bridge": "^3.4.5|^4.0.5" + }, + "suggest": { + "symfony/console": "For helpful console commands such as SQL execution and import of files." + }, + "bin": [ + "bin/doctrine-dbal" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\DBAL\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + } + ], + "description": "Database Abstraction Layer", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "dbal", + "persistence", + "queryobject" + ], + "time": "2018-04-07T18:44:18+00:00" + }, { "name": "doctrine/inflector", "version": "v1.3.0", From eaf465914ae526a9aac0522f71d8ccbcc2f0e7ef Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 4 Jun 2018 02:16:33 -0600 Subject: [PATCH 51/52] Add comment notifications --- app/Http/Controllers/AccountController.php | 4 ++- app/Http/Controllers/CommentController.php | 2 ++ app/Jobs/FollowPipeline/FollowPipeline.php | 2 ++ app/Jobs/LikePipeline/LikePipeline.php | 2 ++ app/Notification.php | 10 ++++++ app/Status.php | 13 ++++++++ ...ons_table_add_polymorphic_relationship.php | 31 +++++++++++++++++++ resources/lang/en/notification.php | 1 + resources/views/account/activity.blade.php | 20 ++++++++++++ 9 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 database/migrations/2018_06_04_061435_update_notifications_table_add_polymorphic_relationship.php diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index f2d1f4092..4a0b5bd5f 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -16,7 +16,9 @@ class AccountController extends Controller public function notifications(Request $request) { $profile = Auth::user()->profile; - $notifications = $this->fetchNotifications($profile->id); + //$notifications = $this->fetchNotifications($profile->id); + $notifications = Notification::whereProfileId($profile->id) + ->orderBy('id','desc')->take(30)->simplePaginate(); return view('account.activity', compact('profile', 'notifications')); } diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php index 1815914c3..1ec7bbf4d 100644 --- a/app/Http/Controllers/CommentController.php +++ b/app/Http/Controllers/CommentController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use App\Jobs\CommentPipeline\CommentPipeline; use App\Jobs\StatusPipeline\NewStatusPipeline; use Auth, Hashids; use App\{Comment, Profile, Status}; @@ -40,6 +41,7 @@ class CommentController extends Controller $reply->save(); NewStatusPipeline::dispatch($reply, false); + CommentPipeline::dispatch($status, $reply); if($request->ajax()) { $response = ['code' => 200, 'msg' => 'Comment saved', 'username' => $profile->username, 'url' => $reply->url(), 'profile' => $profile->url()]; diff --git a/app/Jobs/FollowPipeline/FollowPipeline.php b/app/Jobs/FollowPipeline/FollowPipeline.php index 6688575f3..f7cfa6506 100644 --- a/app/Jobs/FollowPipeline/FollowPipeline.php +++ b/app/Jobs/FollowPipeline/FollowPipeline.php @@ -46,6 +46,8 @@ class FollowPipeline implements ShouldQueue $notification->action = 'follow'; $notification->message = $follower->toText(); $notification->rendered = $follower->toHtml(); + $notification->item_id = $target->id; + $notification->item_type = "App\Profile"; $notification->save(); Cache::forever('notification.' . $notification->id, $notification); diff --git a/app/Jobs/LikePipeline/LikePipeline.php b/app/Jobs/LikePipeline/LikePipeline.php index 8e57072dd..28410bfc3 100644 --- a/app/Jobs/LikePipeline/LikePipeline.php +++ b/app/Jobs/LikePipeline/LikePipeline.php @@ -49,6 +49,8 @@ class LikePipeline implements ShouldQueue $notification->action = 'like'; $notification->message = $like->toText(); $notification->rendered = $like->toHtml(); + $notification->item_id = $status->id; + $notification->item_type = "App\Status"; $notification->save(); Cache::forever('notification.' . $notification->id, $notification); diff --git a/app/Notification.php b/app/Notification.php index 4102ba56e..c40e0a553 100644 --- a/app/Notification.php +++ b/app/Notification.php @@ -17,4 +17,14 @@ class Notification extends Model return $this->belongsTo(Profile::class, 'profile_id', 'id'); } + public function item() + { + return $this->morphTo(); + } + + public function status() + { + return $this->belongsTo(Status::class, 'item_id', 'id'); + } + } diff --git a/app/Status.php b/app/Status.php index 3bf4fc9ca..e5e1a59b9 100644 --- a/app/Status.php +++ b/app/Status.php @@ -101,4 +101,17 @@ class Status extends Model return $obj; } + public function replyToText() + { + $actorName = $this->profile->username; + return "{$actorName} " . __('notification.commented'); + } + + public function replyToHtml() + { + $actorName = $this->profile->username; + $actorUrl = $this->profile->url(); + return "{$actorName} " . + __('notification.commented'); + } } diff --git a/database/migrations/2018_06_04_061435_update_notifications_table_add_polymorphic_relationship.php b/database/migrations/2018_06_04_061435_update_notifications_table_add_polymorphic_relationship.php new file mode 100644 index 000000000..c55fa1573 --- /dev/null +++ b/database/migrations/2018_06_04_061435_update_notifications_table_add_polymorphic_relationship.php @@ -0,0 +1,31 @@ +bigInteger('item_id')->unsigned()->nullable()->after('actor_id'); + $table->string('item_type')->nullable()->after('item_id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/resources/lang/en/notification.php b/resources/lang/en/notification.php index 99b6ed099..2f85c4386 100644 --- a/resources/lang/en/notification.php +++ b/resources/lang/en/notification.php @@ -4,5 +4,6 @@ return [ 'likedPhoto' => 'liked your photo.', 'startedFollowingYou' => 'started following you.', + 'commented' => 'commented on your post.', ]; \ No newline at end of file diff --git a/resources/views/account/activity.blade.php b/resources/views/account/activity.blade.php index 241d46f8a..a6bd0c388 100644 --- a/resources/views/account/activity.blade.php +++ b/resources/views/account/activity.blade.php @@ -18,8 +18,12 @@ {{$notification->created_at->diffForHumans(null, true, true, true)}} + @if($notification->item_id) + + @endif @break + @case('follow') @@ -38,6 +42,22 @@ @endif @break + + @case('comment') + + + + + {!! $notification->rendered !!} + {{$notification->created_at->diffForHumans(null, true, true, true)}} + + + @if($notification->item_id) + + @endif + + @break + @endswitch @endforeach From 20432ada5fe859ff562c0827536794fa32074857 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 4 Jun 2018 02:25:40 -0600 Subject: [PATCH 52/52] Add CommentPipeline --- app/Jobs/CommentPipeline/CommentPipeline.php | 69 ++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 app/Jobs/CommentPipeline/CommentPipeline.php diff --git a/app/Jobs/CommentPipeline/CommentPipeline.php b/app/Jobs/CommentPipeline/CommentPipeline.php new file mode 100644 index 000000000..fb0de7ebb --- /dev/null +++ b/app/Jobs/CommentPipeline/CommentPipeline.php @@ -0,0 +1,69 @@ +status = $status; + $this->comment = $comment; + } + + /** + * Execute the job. + * + * @return void + */ + public function handle() + { + $status = $this->status; + $comment = $this->comment; + + $target = $status->profile; + $actor = $comment->profile; + + try { + + $notification = new Notification; + $notification->profile_id = $target->id; + $notification->actor_id = $actor->id; + $notification->action = 'comment'; + $notification->message = $comment->replyToText(); + $notification->rendered = $comment->replyToHtml(); + $notification->item_id = $comment->id; + $notification->item_type = "App\Status"; + $notification->save(); + + Cache::forever('notification.' . $notification->id, $notification); + + $redis = Redis::connection(); + + $nkey = config('cache.prefix').':user.' . $target->id . '.notifications'; + $redis->lpush($nkey, $notification->id); + + } catch (Exception $e) { + Log::error($e); + } + + } +}