diff --git a/app/Profile.php b/app/Profile.php
index b386ffda..7e6edcae 100644
--- a/app/Profile.php
+++ b/app/Profile.php
@@ -308,4 +308,10 @@ class Profile extends Model
{
return $this->hasMany(Story::class);
}
+
+
+ public function reported()
+ {
+ return $this->hasMany(Report::class, 'object_id');
+ }
}
diff --git a/app/Services/ActivityPubDeliveryService.php b/app/Services/ActivityPubDeliveryService.php
index 1e1b5851..00d6aa62 100644
--- a/app/Services/ActivityPubDeliveryService.php
+++ b/app/Services/ActivityPubDeliveryService.php
@@ -6,7 +6,8 @@ use App\Profile;
use App\Util\ActivityPub\Helpers;
use App\Util\ActivityPub\HttpSignature;
-class ActivityPubDeliveryService {
+class ActivityPubDeliveryService
+{
public $sender;
public $to;
diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache
index 18da11fc..aa3c3fd2 100644
--- a/contrib/docker/Dockerfile.apache
+++ b/contrib/docker/Dockerfile.apache
@@ -5,7 +5,7 @@ ARG COMPOSER_CHECKSUM="1f210b9037fcf82670d75892dfc44400f13fe9ada7af9e787f93e50e3
RUN apt-get update \
&& apt-get install -y --no-install-recommends apt-utils \
- && apt-get install -y --no-install-recommends git gosu \
+ && apt-get install -y --no-install-recommends git gosu ffmpeg \
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 mariadb-client\
diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm
index d4f8eaa6..44e85707 100644
--- a/contrib/docker/Dockerfile.fpm
+++ b/contrib/docker/Dockerfile.fpm
@@ -4,7 +4,7 @@ ARG COMPOSER_CHECKSUM="1f210b9037fcf82670d75892dfc44400f13fe9ada7af9e787f93e50e3
RUN apt-get update \
&& apt-get install -y --no-install-recommends apt-utils \
- && apt-get install -y --no-install-recommends git gosu \
+ && apt-get install -y --no-install-recommends git gosu ffmpeg \
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 mariadb-client\
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index c46cc59b..c146130f 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -15,7 +15,7 @@
-
+
@stack('meta')
@@ -23,7 +23,7 @@
-
+
@if(request()->cookie('dark-mode'))