From 8d32ff058984db3fd00e51e03c3ea7e28a83aabf Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Mon, 10 Dec 2018 21:23:29 -0700
Subject: [PATCH 1/2] Update Timeline.vue, add missing notification type

---
 config/pixelfed.php                         |   2 +-
 public/js/components.js                     | Bin 586575 -> 586750 bytes
 public/mix-manifest.json                    | Bin 321 -> 321 bytes
 resources/assets/js/components/Timeline.vue |   5 +++++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/pixelfed.php b/config/pixelfed.php
index c13931be6..c4c55bfdb 100644
--- a/config/pixelfed.php
+++ b/config/pixelfed.php
@@ -23,7 +23,7 @@ return [
     | This value is the version of your PixelFed instance.
     |
     */
-    'version' => '0.5.1',
+    'version' => '0.5.2',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/public/js/components.js b/public/js/components.js
index 28802d7b054b083be7d739070d2d82b387c729c1..9b21b553a87b6482ad75527d77e6bb99f9bed626 100644
GIT binary patch
delta 239
zcmX^AO!?n)<qhljHV3+^M$1Oz7NjX@>L?oOq?P6+mt^MWX_RPI=V>TaWVn}2kI!UM
z*}Q$xM<-@uqnzmpCt1y>?~`Y}#^Ms_6*gVgf?cQi`qTF7PZ@!j35c1uUw_K7#&Y`<
z1y)rN7Ld`CHxy+~?`vn{o1Ev&x!Ht&f*!k4T7FJWe);5Bn<gFzGc`q_GQV`PrH#zy
zBeuPqERjKOE|UY_I&U*&{jsIJ;T7xlhF5HB%UD280*XtqxPV-<AcIMLdcq@CZ6V`S
egT!Qmq+}(XOdUl7o$6Z6cI`y=?b?YPDw6=Of?O8>

delta 235
zcmezOT>1Pn<qhlj*p&?PQqq;IrWcyBNlZ3~5171PNMQTqKP=Prw%^uf?d9COj!!jO
z7OY59N6}Cxtu!yWBr`uxqeQbhPeUmqxzv2~hfGmt=0LBo=?mSN44OUHwR^5(1Y#y2
zX5Q|(j%9@<OQ=s;=JY}*R<p@=Yp-wr_?$&mggG+EZF-?Gllb%pk62lz`|`7CZeMT8
z`eO?V$k53f1*BL(x|F6jn6SA{pZ|b^N5VA8GA+&6!bC|YQ%BK2r@B_NRwvWaHxi_H
d^8QS&_Vce;x1WE-)>_tnCy{;ookR|$NdPNtS5*K2

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 6a8b80f4dac905475687b8d315f6215a6f426443..cf0361d3dafb43371b76333f3ed8927d182fcb7b 100644
GIT binary patch
delta 30
lcmX@ebdYI+p-7r}YFe6MlDV;gNwTS#VTx&*Me;<~KLC`03HAU0

delta 30
kcmX@ebdYI+p@^kfa;mX~i3JcC85^Y-n;RG>PIUbP0Ea3G4FCWD

diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index 5df06c5d5..450414f36 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -308,6 +308,11 @@
 										<span class="font-weight-bold">{{n.account.username}}</span> mentioned you.
 									</p>
 								</div>
+								<div v-else-if="n.type == 'follow'">
+									<p class="my-0">
+										<span class="font-weight-bold">{{n.account.username}}</span> followed you.
+									</p>	
+								</div>
 							</div>
 							
 						</div>

From 564fd932903b53a4c7adc303017d7b37f9911792 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Mon, 10 Dec 2018 21:26:11 -0700
Subject: [PATCH 2/2] Update StatusController

---
 app/Http/Controllers/StatusController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php
index f25042318..8c04bbf4a 100644
--- a/app/Http/Controllers/StatusController.php
+++ b/app/Http/Controllers/StatusController.php
@@ -279,7 +279,7 @@ class StatusController extends Controller
         $photos = 0;
         $videos = 0;
         foreach($mimes as $mime) {
-            if(in_array($mime, $allowed) == false) {
+            if(in_array($mime, $allowed) == false && $mime !== 'video/mp4') {
                 continue;
             }
             if(str_contains($mime, 'image/')) {