From 205705193d505557d1a497411c62c5fcb01bc1f8 Mon Sep 17 00:00:00 2001 From: Ondrej Brinkel Date: Mon, 7 Dec 2020 23:11:54 +0100 Subject: [PATCH 1/3] fixes docker build - composer package prestissimo is deprecated as composer got faster - `composer update` should not be required as there is a `composer.lock`, actually it was the cause for breaking docker builds as an upstream package had a broken version string in it's requirerements. Using fixed package versions prevents these kinds of problems in future. --- contrib/docker/Dockerfile.apache | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index e9e58805a..f2fb254cf 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -92,11 +92,9 @@ RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \ COPY . /var/www/ # for detail why storage is copied this way, pls refer to https://github.com/pixelfed/pixelfed/pull/2137#discussion_r434468862 RUN cp -r storage storage.skel \ - && composer global require hirak/prestissimo --prefer-dist --no-interaction --no-ansi --no-suggest \ && composer install --prefer-dist --no-interaction --no-ansi --optimize-autoloader \ - && composer update --prefer-dist --no-interaction --no-ansi \ - && composer global remove hirak/prestissimo --no-interaction --no-ansi \ - && rm -rf html && ln -s public html + && rm -rf html && ln -s public html \ + && chown -R www-data:www-data /var/www VOLUME /var/www/storage /var/www/bootstrap CMD ["/var/www/contrib/docker/start.apache.sh"] From 2eca670e11fd16e398fcf851ddb6f276f453e607 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 9 Dec 2020 22:46:31 -0700 Subject: [PATCH 2/3] Update reply/comment view, improve layout and include child reply --- resources/views/status/reply.blade.php | 100 ++++++++++++++++++++----- 1 file changed, 81 insertions(+), 19 deletions(-) diff --git a/resources/views/status/reply.blade.php b/resources/views/status/reply.blade.php index 1a886faf2..f59df58da 100644 --- a/resources/views/status/reply.blade.php +++ b/resources/views/status/reply.blade.php @@ -4,27 +4,62 @@
-
-
+
+ @if($status->parent()->parent()) +
- + @if($status->parent()->parent()->media()->count()) + + @endif
-
-
- - {{$status->parent()->profile->username}} -
-
- -
-
-

{{ str_limit($status->parent()->caption, 125) }}

+
+ +
+ {{$status->parent()->parent()->profile->username}} +
+

{!!$status->parent()->parent()->rendered!!}

+
+
+ + {{$status->parent()->parent()->created_at->diffForHumans()}} + +
+
+ +
-
+ @endif +
+
+ @if($status->parent()->media()->count()) + + @endif +
+
+
+ +
+ {{$status->parent()->profile->username}} +
+

{!!$status->parent()->rendered!!}

+
+
+ + {{$status->parent()->created_at->diffForHumans()}} + +
+
+ +
+
+
+
+
+
@if($status->is_nsfw)
@@ -34,8 +69,8 @@
{{$status->profile->username}}
-

{!! $status->rendered !!}

-
+

{!! $status->rendered !!}

+
{{$status->created_at->diffForHumans()}} @@ -48,8 +83,8 @@
{{$status->profile->username}}
-

{!! $status->rendered !!}

-
+

{!! $status->rendered !!}

+
{{$status->created_at->diffForHumans()}} @@ -66,6 +101,34 @@
@endif
+ @if($status->comments->count()) +
+
+ @if($status->comments()->first()->media()->count()) + + @endif +
+
+
+ +
+ {{$status->comments()->first()->profile->username}} +
+

{!!$status->comments()->first()->rendered!!}

+
+
+ + {{$status->comments()->first()->created_at->diffForHumans()}} + +
+
+ +
+
+
+
+
+ @endif
@@ -108,7 +171,6 @@ @endpush @push('scripts') -