From 3ba77206b5e0a4f88fdef9ab57e7d9f7ae4c0332 Mon Sep 17 00:00:00 2001
From: Johnny Malizia <johnny@malizia.tech>
Date: Mon, 10 Feb 2020 23:29:27 -0800
Subject: [PATCH 1/4] Updated Dockerfiles to include ffmpeg

---
 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 18da11fc8..aa3c3fd2b 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 d4f8eaa64..44e85707b 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\

From a34f38633c597b33045b07dbee3d01bb5906e60c Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 11 Feb 2020 21:41:16 -0700
Subject: [PATCH 2/4] Update Profile model, add reported relationship

---
 app/Profile.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Profile.php b/app/Profile.php
index b386ffda6..7e6edcaea 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');
+    }
 }

From e0ab73c1023a250b97a179a09c46049241085aeb Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 11 Feb 2020 21:41:54 -0700
Subject: [PATCH 3/4] CS fix

---
 app/Services/ActivityPubDeliveryService.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Services/ActivityPubDeliveryService.php b/app/Services/ActivityPubDeliveryService.php
index 1e1b5851d..00d6aa629 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;

From 382857ee94faff68500ccc11ffb793f71a79de4b Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 12 Feb 2020 19:34:45 -0700
Subject: [PATCH 4/4] Update app layout

---
 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 c46cc59b4..c146130fc 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -15,7 +15,7 @@
     <meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
     <meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
     <meta property="og:type" content="article">
-    <meta property="og:url" content="{{request()->url()}}">
+    <meta property="og:url" content="{{url(request()->url())}}">
     @stack('meta')
 
     <meta name="medium" content="image">
@@ -23,7 +23,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <link rel="shortcut icon" type="image/png" href="/img/favicon.png?v=2">
     <link rel="apple-touch-icon" type="image/png" href="/img/favicon.png?v=2">
-    <link rel="canonical" href="{{request()->url()}}">
+    <link rel="canonical" href="{{url(request()->url())}}">
     @if(request()->cookie('dark-mode')) 
     
     <link href="{{ mix('css/appdark.css') }}" rel="stylesheet" data-stylesheet="dark">