From 7aea7506dfda55acc6117fa8ab8f08216b3c1e4c Mon Sep 17 00:00:00 2001
From: Simounet <contact@simounet.net>
Date: Sat, 8 Dec 2018 13:43:17 +0100
Subject: [PATCH 01/11] Fix private pic display

---
 app/Http/Controllers/PublicApiController.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php
index 440effd86..ffda8c546 100644
--- a/app/Http/Controllers/PublicApiController.php
+++ b/app/Http/Controllers/PublicApiController.php
@@ -161,6 +161,7 @@ class PublicApiController extends Controller
         switch ($status->scope) {
             case 'public':
             case 'unlisted':
+            case 'private':
                 $user = Auth::check() ? Auth::user() : false;
                 if($user && $profile->is_private) {
                     $follows = Follower::whereProfileId($user->profile->id)
@@ -172,15 +173,6 @@ class PublicApiController extends Controller
                 }
                 break;
 
-            case 'private':
-                $follows = Follower::whereProfileId($user->profile->id)
-                    ->whereFollowingId($profile->id)
-                    ->exists();
-                if($follows == false && $profile->id !== $user->profile->id) {
-                    abort(404);
-                }
-                break;
-
             case 'direct':
                 abort(404);
                 break;

From be081c6427d5b5e9f7b2f4d32beaa39746221a55 Mon Sep 17 00:00:00 2001
From: Urtzi Odriozola <uodriozola@codesyntax.com>
Date: Fri, 23 Nov 2018 17:24:12 +0100
Subject: [PATCH 02/11] Basque localization

---
 resources/lang/eu/auth.php                    |  20 +++
 resources/lang/eu/navmenu.php                 |  14 ++
 resources/lang/eu/notification.php            |   8 ++
 resources/lang/eu/pagination.php              |  19 +++
 resources/lang/eu/passwords.php               |  22 ++++
 resources/lang/eu/profile.php                 |   8 ++
 resources/lang/eu/timeline.php                |   5 +
 resources/lang/eu/validation.php              | 122 ++++++++++++++++++
 .../lang/vendor/backup/eu/notifications.php   |  35 +++++
 9 files changed, 253 insertions(+)
 create mode 100644 resources/lang/eu/auth.php
 create mode 100644 resources/lang/eu/navmenu.php
 create mode 100644 resources/lang/eu/notification.php
 create mode 100644 resources/lang/eu/pagination.php
 create mode 100644 resources/lang/eu/passwords.php
 create mode 100644 resources/lang/eu/profile.php
 create mode 100644 resources/lang/eu/timeline.php
 create mode 100644 resources/lang/eu/validation.php
 create mode 100644 resources/lang/vendor/backup/eu/notifications.php

diff --git a/resources/lang/eu/auth.php b/resources/lang/eu/auth.php
new file mode 100644
index 000000000..4c2afbf16
--- /dev/null
+++ b/resources/lang/eu/auth.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+
+    'failed'   => 'Sartutako datuek ez dute balio.',
+    'throttle' => 'Saiakera gehiegi. Mesedez, saitu zaitez :seconds segundo barru.',
+
+];
diff --git a/resources/lang/eu/navmenu.php b/resources/lang/eu/navmenu.php
new file mode 100644
index 000000000..cfa8903c6
--- /dev/null
+++ b/resources/lang/eu/navmenu.php
@@ -0,0 +1,14 @@
+<?php
+
+return [
+
+    'viewMyProfile'  => 'Ikusi nire profila',
+    'myTimeline'     => 'Nire denboralerroa',
+    'publicTimeline' => 'Denboralerro publikoa',
+    'remoteFollow'   => 'Urruneko Jarraipena',
+    'settings'       => 'Ezarpenak',
+    'admin'          => 'Admin',
+    'logout'         => 'Irten',
+    'directMessages' => 'Mezu zuzenak',
+
+];
diff --git a/resources/lang/eu/notification.php b/resources/lang/eu/notification.php
new file mode 100644
index 000000000..0e3280155
--- /dev/null
+++ b/resources/lang/eu/notification.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+
+  'likedPhoto'          => '-(e)k argazkia gustuko du.',
+  'startedFollowingYou' => 'jarraitzen hasi zaizu.',
+
+];
diff --git a/resources/lang/eu/pagination.php b/resources/lang/eu/pagination.php
new file mode 100644
index 000000000..466ad1880
--- /dev/null
+++ b/resources/lang/eu/pagination.php
@@ -0,0 +1,19 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '« Aurrekoa',
+    'next'     => 'Hurrengoa »',
+
+];
diff --git a/resources/lang/eu/passwords.php b/resources/lang/eu/passwords.php
new file mode 100644
index 000000000..3c113a385
--- /dev/null
+++ b/resources/lang/eu/passwords.php
@@ -0,0 +1,22 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    'password' => 'Pasahitzak gutxienez 6 karaktere izan behar ditu, eta konfirmazio pasahitzarekin bat etorri behar da.',
+    'reset'    => 'Pasahitza aldatu da!',
+    'sent'     => 'E-postara pasahitza aldatzeko esteka bidali dizugu.',
+    'token'    => 'Pasahitza aldatzeko "token"-ak ez du balio.',
+    'user'     => 'Ez dugu aurkitu pasahitz hori duen erabiltzailerik.',
+
+];
diff --git a/resources/lang/eu/profile.php b/resources/lang/eu/profile.php
new file mode 100644
index 000000000..f83e789b1
--- /dev/null
+++ b/resources/lang/eu/profile.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+  'emptyTimeline'  => 'Erabiltzaile honek oraindik ez du ezer bidali!',
+  'emptyFollowers' => 'Erabiltzaile honek ez du jarraitzailerik!',
+  'emptyFollowing' => 'Erabiltzaile honek oraindik ez du inor jarraitzen',
+  'savedWarning'   => 'Gordetakoa zuk bakarrik ikusi dezakezu',
+];
diff --git a/resources/lang/eu/timeline.php b/resources/lang/eu/timeline.php
new file mode 100644
index 000000000..7a157962d
--- /dev/null
+++ b/resources/lang/eu/timeline.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+  'emptyPersonalTimeline' => 'Zure denbora lerroa hutsik dago.',
+];
diff --git a/resources/lang/eu/validation.php b/resources/lang/eu/validation.php
new file mode 100644
index 000000000..58e2c4225
--- /dev/null
+++ b/resources/lang/eu/validation.php
@@ -0,0 +1,122 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages here.
+    |
+    */
+
+    'accepted'             => ':attribute onartuak izan behar dira.',
+    'active_url'           => ':attribute helbideak ez du zuzena.',
+    'after'                => ':attribute datak :date baino beranduagokoa izan behar du.',
+    'after_or_equal'       => ':attribute datak :date baino beranduagokoa edo berdina izan behar du.',
+    'alpha'                => ':attribute -(e)k letrak bakarrik izan ditzake',
+    'alpha_dash'           => ':attribute -(e)k letrak, zenbakiak eta gidoiak bakarrik onartzen ditu.',
+    'alpha_num'            => ':attribute -(e)k letrak eta zenbakiak bakarrik onartzen ditu',
+    'array'                => ':attribute zerrenda izan behar da.',
+    'before'               => ':attribute datak :date baino lehenagokoa izan behar du.',
+    'before_or_equal'      => ':attribute datak :date baino lehenagokoa edo berdina izan behar du.',
+    'between'              => [
+        'numeric' => ':attribute :min eta :max -ren artean izan behar da.',
+        'file'    => ':attribute :min eta :max kilobytes artean izan behar da.',
+        'string'  => ':attribute -(e)k :min eta :max karaktere bitartean izan behar ditu.',
+        'array'   => ':attribute -(e)k :min eta :max elementu bitartean izan behar ditu.',
+    ],
+    'boolean'              => ':attribute eremua "True" edo "False" izan behar da.',
+    'confirmed'            => ':attribute-ren baieztapenak ez datoz bat.',
+    'date'                 => ':attribute ez da data formatu egokia.',
+    'date_format'          => ':attribute -(e)k ez du :format formatua betetzen.',
+    'different'            => ':attribute eta :other ezberdinak izan behar dira.',
+    'digits'               => ':attribute -(e)k :digits zifra izan behar ditu.',
+    'digits_between'       => ':attribute -(e)k :min eta :max zifra bitartean izan behar ditu.',
+    'dimensions'           => ':attribute -(e)k onartzen ez diren tamainak ditu.',
+    'distinct'             => ':attribute eremuak bikoiztutako balorea du.',
+    'email'                => ':attribute eremua e-posta izan behar da.',
+    'exists'               => 'Aukeratutako :attribute ez da baliozkoa.',
+    'file'                 => ':attribute eremua fitxategia izan behar da.',
+    'filled'               => ':attribute eremuak balio egokia izan behar du.',
+    'image'                => ':attribute eremua irudia izan behar da.',
+    'in'                   => 'Aukeratutako :attribute elementua ez da baliozkoa.',
+    'in_array'             => ':attribute eremua ez da :other -en existitzen.',
+    'integer'              => ':attribute zenbaki osoa izen behar da.',
+    'ip'                   => ':attribute eremua IP helbide egokia izan behar da.',
+    'ipv4'                 => ':attribute eremua IPv4 helbide egokia izan behar da.',
+    'ipv6'                 => ':attribute eremua IPv6 helbide egokia izan behar da.',
+    'json'                 => ':attribute eremuak JSON egokia izan behar du.',
+    'max'                  => [
+        'numeric' => ':attribute ezin da :max baino handiagoa izan.',
+        'file'    => ':attribute -(e)k ezin du :max kilobyte baino gehiago izan.',
+        'string'  => ':attribute -(e)k ezin ditu :max karaktere baino gehiago izan.',
+        'array'   => ':attribute -(e)k ezin ditu :max elementu baino gehiago izan.',
+    ],
+    'mimes'                => ':attribute :values motatako fitxategia izan behar da.',
+    'mimetypes'            => ':attribute :values motatako fitxategia izan behar da.',
+    'min'                  => [
+        'numeric' => ':attribute gutxienez :min izan behar da.',
+        'file'    => ':attribute gutxienez :min kilobyte izan behar ditu.',
+        'string'  => ':attribute gutxienez :min karaktere izan behar ditu.',
+        'array'   => ':attribute -(e)k gutxienez :min elementu izan behar ditu.',
+    ],
+    'not_in'               => 'Aukeratutako :attribute elementuak ez du balio.',
+    'not_regex'            => ':attribute formatua ez da zuzena.',
+    'numeric'              => ':attribute zenbakia izan behar da.',
+    'present'              => ':attribute eremua egon behar da.',
+    'regex'                => ':attribute -ren formatua ez da zuzena.',
+    'required'             => ':attribute eremua derrigorrezkoa da.',
+    'required_if'          => ':attribute eremua derrigorrezkoa da :other :value denean.',
+    'required_unless'      => ':attribute eremua derrigorrezkoa da :other :values izan ezean.',
+    'required_with'        => ':values dagoenean, :attribute eremua derrigorrezkoa da.',
+    'required_with_all'    => ':values dagoenean, :attribute eremua derrigorrezkoa da.',
+    'required_without'     => ':attribute eremua derrigorrezkoa da :values eremua ez dagoenean.',    
+    'required_without_all' => ':attribute eremua beharrezkoa da :values bat bera ere ez dagoenean.',
+    'same'                 => ':attribute eta :other bat etorri behar dira.',
+    'size'                 => [
+        'numeric' => ':attribute :size izan behar da.',
+        'file'    => ':attribute -(e)k :size kilobyte izan behar ditu.',
+        'string'  => ':attribute -(e)k :size karaktere izan behar ditu.',
+        'array'   => ':attribute -(e)k :size elementu izan behar ditu.',
+    ],
+    'string'               => ':attribute testua izan behar da.',
+    'timezone'             => ':attribute ordutegi zuzena izan behar du.',
+    'unique'               => ':attribute ez dago eskuragarri.',
+    'uploaded'             => ':attribute igotzerakoan akatsa.',
+    'url'                  => ':attribute -ren formatua ez da egokia.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [],
+
+];
diff --git a/resources/lang/vendor/backup/eu/notifications.php b/resources/lang/vendor/backup/eu/notifications.php
new file mode 100644
index 000000000..dbc414a02
--- /dev/null
+++ b/resources/lang/vendor/backup/eu/notifications.php
@@ -0,0 +1,35 @@
+<?php
+
+return [
+    'exception_message' => 'Salbuespen mezua: :message',
+    'exception_trace' => 'Salbuespen aztarna: :trace',
+    'exception_message_title' => 'Salbuespen mezua',
+    'exception_trace_title' => 'Salbuespen aztarna',
+
+    'backup_failed_subject' => 'Akatsa :application_name babeskopia egiterakoan',
+    'backup_failed_body' => 'Garrantzitsua: Akatsa gertatu da :application_name babeskopia egiterakoan',
+
+    'backup_successful_subject' => ':application_name babeskopia arrakastatsua',
+    'backup_successful_subject_title' => 'Babeskopia arrakastatsu berria!',
+    'backup_successful_body' => 'Berri onak, :application_name -ren babeskopia berria arrakastaz sortu da :disk_name izeneko diskoan.',
+
+    'cleanup_failed_subject' => ':application_name -ren babeskopiak garbitzean akatsa.',
+    'cleanup_failed_body' => 'Akatsa gertatu da :application_name -ren babeskopiak garbitzerakoan',
+
+    'cleanup_successful_subject' => ':application_name -ren babeskopiak arrakastaz garbituta',
+    'cleanup_successful_subject_title' => 'Babeskopien garbitze arrakastatsua!',
+    'cleanup_successful_body' => ':application_name -ren babeskopia garbitzea arrakastaz gauzatu da :disk_name izeneko diskoan.',
+
+    'healthy_backup_found_subject' => ':application_name -rentzat diren babeskopiak osasuntsu daude :disk_name diskoan',
+    'healthy_backup_found_subject_title' => ':application_name -rentzat diren babeskopiak osasuntsu daude',
+    'healthy_backup_found_body' => ':application_name -rentzat diren babeskopiak osasuntsutzat jotzen dira. Lan bikaina!',
+
+    'unhealthy_backup_found_subject' => 'Garrantzitsua: :application_name -rentzat diren babeskopiak ez daude osasuntsu',
+    'unhealthy_backup_found_subject_title' => 'Garrantzitsua: :application_name -rentzat diren babeskopiak ez daude osasuntsu. :problem',
+    'unhealthy_backup_found_body' => ':application_name -rentzat diren babeskopiak ez daude osasuntsu :disk_name diskoan.',
+    'unhealthy_backup_found_not_reachable' => 'Babeskopien helburua ezin izan da atzitu. :error',
+    'unhealthy_backup_found_empty' => 'Ez dago aplikazio honen babeskopiarik.',
+    'unhealthy_backup_found_old' => 'Azkena .date -n egindako babeskopia zaharregitzat jotzen da.',
+    'unhealthy_backup_found_unknown' => 'Barkatu, ezin da arrazoi zehatza zehaztu.',
+    'unhealthy_backup_found_full' => 'Babeskopiak leku gehiegi erabiltzen ari dira. Egungo erabilera :disk_usage -koa da, non, onartutako :disk_limit muga baino handiagoa den.',
+];

From 997a913aa1ac2bb501f7446b016f7d5965a132a3 Mon Sep 17 00:00:00 2001
From: Urtzi Odriozola <uodriozola@codesyntax.com>
Date: Tue, 11 Dec 2018 22:44:58 +0100
Subject: [PATCH 03/11] Create site.php

---
 resources/lang/eu/site.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 resources/lang/eu/site.php

diff --git a/resources/lang/eu/site.php b/resources/lang/eu/site.php
new file mode 100644
index 000000000..82b481361
--- /dev/null
+++ b/resources/lang/eu/site.php
@@ -0,0 +1,13 @@
+<?php
+return [
+	'about'			=> 'Honi buruz',
+	'help'			=> 'Laguntza',
+	'language'		=> 'Hizkuntza',
+	'fediverse'		=> 'Fedibertsoa',
+	'opensource'	=> 'Kode irekia',
+	'terms'			=> 'Lege oharra',
+	'privacy'		=> 'Pribatutasuna',
+	'l10nWip'		=> 'Oraindik lokalizazioen sustenguan lanean gaude',
+	'currentLocale' => 'Uneko hizkuntza',
+	'selectLocale'  => 'Aukeratu onartutako hizkuntzetako bat',
+];

From 8df9e59ba881ec1f200b947de1f601912c5a96bb Mon Sep 17 00:00:00 2001
From: Urtzi Odriozola <uodriozola@codesyntax.com>
Date: Tue, 11 Dec 2018 22:46:37 +0100
Subject: [PATCH 04/11] Update site.php

---
 resources/lang/eu/site.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/eu/site.php b/resources/lang/eu/site.php
index 82b481361..10a105e69 100644
--- a/resources/lang/eu/site.php
+++ b/resources/lang/eu/site.php
@@ -7,7 +7,7 @@ return [
 	'opensource'	=> 'Kode irekia',
 	'terms'			=> 'Lege oharra',
 	'privacy'		=> 'Pribatutasuna',
-	'l10nWip'		=> 'Oraindik lokalizazioen sustenguan lanean gaude',
+	'l10nWip'		=> 'Oraindik lokalizazioen sustenguan lanean ari gara',
 	'currentLocale' => 'Uneko hizkuntza',
 	'selectLocale'  => 'Aukeratu onartutako hizkuntzetako bat',
 ];

From c0794be67e932e5ecb785b423a831537359644cf Mon Sep 17 00:00:00 2001
From: Urtzi Odriozola <uodriozola@codesyntax.com>
Date: Tue, 11 Dec 2018 23:00:19 +0100
Subject: [PATCH 05/11] Update site.php

---
 resources/lang/eu/site.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/eu/site.php b/resources/lang/eu/site.php
index 10a105e69..410481ae4 100644
--- a/resources/lang/eu/site.php
+++ b/resources/lang/eu/site.php
@@ -5,9 +5,9 @@ return [
 	'language'		=> 'Hizkuntza',
 	'fediverse'		=> 'Fedibertsoa',
 	'opensource'	=> 'Kode irekia',
-	'terms'			=> 'Lege oharra',
+	'terms'			=> 'Baldintzak',
 	'privacy'		=> 'Pribatutasuna',
 	'l10nWip'		=> 'Oraindik lokalizazioen sustenguan lanean ari gara',
-	'currentLocale' => 'Uneko hizkuntza',
+	'currentLocale' => 'Uneko lokalizazioa',
 	'selectLocale'  => 'Aukeratu onartutako hizkuntzetako bat',
 ];

From 857b16e8341316e221b9d32308531046809f3cd6 Mon Sep 17 00:00:00 2001
From: Aditoo17 <42938951+Aditoo17@users.noreply.github.com>
Date: Wed, 12 Dec 2018 16:52:53 +0100
Subject: [PATCH 06/11] L10n: Update Czech translation

---
 resources/lang/cs/site.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 resources/lang/cs/site.php

diff --git a/resources/lang/cs/site.php b/resources/lang/cs/site.php
new file mode 100644
index 000000000..f02ca5301
--- /dev/null
+++ b/resources/lang/cs/site.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+
+	'about'			=> 'O nás',
+	'help'			=> 'Nápověda',
+	'language'		=> 'Jazyk',
+	'fediverse'		=> 'Fediverse',
+	'opensource'	=> 'Otevřený zdroj',
+	'terms'			=> 'Podmínky',
+	'privacy'		=> 'Soukromí',
+	'l10nWip'		=> 'Pořád pracujeme na podpoře lokalizace',
+	'currentLocale' => 'Aktuální překlad',
+	'selectLocale'  => 'Vyberte si jeden z podporovaných překladů',
+
+];

From a5929584de51744c93d4257af010011bb48fd092 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 15 Dec 2018 22:20:01 -0700
Subject: [PATCH 07/11] Abstract presenter logic into separate components to
 reuse across timeline and post views

---
 resources/assets/js/components.js             | 31 ++++++++++
 .../presenter/MixedAlbumPresenter.vue         | 56 +++++++++++++++++++
 .../presenter/PhotoAlbumPresenter.vue         | 40 +++++++++++++
 .../components/presenter/PhotoPresenter.vue   | 24 ++++++++
 .../presenter/VideoAlbumPresenter.vue         | 44 +++++++++++++++
 .../components/presenter/VideoPresenter.vue   | 26 +++++++++
 6 files changed, 221 insertions(+)
 create mode 100644 resources/assets/js/components/presenter/MixedAlbumPresenter.vue
 create mode 100644 resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
 create mode 100644 resources/assets/js/components/presenter/PhotoPresenter.vue
 create mode 100644 resources/assets/js/components/presenter/VideoAlbumPresenter.vue
 create mode 100644 resources/assets/js/components/presenter/VideoPresenter.vue

diff --git a/resources/assets/js/components.js b/resources/assets/js/components.js
index 48ad4e922..e1cbe2415 100644
--- a/resources/assets/js/components.js
+++ b/resources/assets/js/components.js
@@ -58,6 +58,32 @@ require('./components/notifications');
 // Initalize Notification Helper
 window.pixelfed.n = {};
 
+Vue.component(
+    'photo-presenter',
+    require('./components/presenter/PhotoPresenter.vue')
+);
+
+Vue.component(
+    'video-presenter',
+    require('./components/presenter/VideoPresenter.vue')
+);
+
+Vue.component(
+    'photo-album-presenter',
+    require('./components/presenter/PhotoAlbumPresenter.vue')
+);
+
+Vue.component(
+    'video-album-presenter',
+    require('./components/presenter/VideoAlbumPresenter.vue')
+);
+
+
+Vue.component(
+    'mixed-album-presenter',
+    require('./components/presenter/MixedAlbumPresenter.vue')
+);
+
 Vue.component(
     'follow-suggestions',
     require('./components/FollowSuggestions.vue')
@@ -88,6 +114,11 @@ Vue.component(
     require('./components/Timeline.vue')
 );
 
+// Vue.component(
+//     'micro',
+//     require('./components/Micro.vue')
+// );
+
 Vue.component(
     'passport-clients',
     require('./components/passport/Clients.vue')
diff --git a/resources/assets/js/components/presenter/MixedAlbumPresenter.vue b/resources/assets/js/components/presenter/MixedAlbumPresenter.vue
new file mode 100644
index 000000000..d3d7bb3a8
--- /dev/null
+++ b/resources/assets/js/components/presenter/MixedAlbumPresenter.vue
@@ -0,0 +1,56 @@
+<template>
+	<div v-if="status.sensitive == true">
+		<details class="details-animated">
+			<summary>
+				<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
+				<p class="font-weight-light">(click to show)</p>
+			</summary>
+			<b-carousel :id="status.id + '-carousel'"
+				style="text-shadow: 1px 1px 2px #333; background-color: #000;"
+				controls
+				img-blank
+				background="#ffffff"
+				:interval="0"
+			>
+				<b-carousel-slide v-for="(media, index) in status.media_attachments" :key="media.id + '-media'">
+
+					<video v-if="media.type == 'Video'" slot="img" class="embed-responsive-item" preload="none" controls loop :alt="media.description" width="100%" height="100%">
+						<source :src="media.url" :type="media.mime">
+					</video>
+
+					<img v-else-if="media.type == 'Image'" slot="img" class="d-block img-fluid w-100" :src="media.url" :alt="media.description">
+
+					<p v-else class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
+
+				</b-carousel-slide>
+			</b-carousel>
+		</details>
+	</div>
+	<div v-else>
+		<b-carousel :id="status.id + '-carousel'"
+					style="text-shadow: 1px 1px 2px #333; background-color: #000;"
+					controls
+					img-blank
+					background="#ffffff"
+					:interval="0"
+				>
+			<b-carousel-slide v-for="(media, index) in status.media_attachments" :key="media.id + '-media'">
+
+				<video v-if="media.type == 'Video'" slot="img" class="embed-responsive-item" preload="none" controls loop :alt="media.description" width="100%" height="100%">
+					<source :src="media.url" :type="media.mime">
+				</video>
+
+				<img v-else-if="media.type == 'Image'" slot="img" class="d-block img-fluid w-100" :src="media.url" :alt="media.description">
+
+				<p v-else class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
+
+			</b-carousel-slide>
+		</b-carousel>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: ['status']
+	}
+</script>
\ No newline at end of file
diff --git a/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
new file mode 100644
index 000000000..4bf66f790
--- /dev/null
+++ b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
@@ -0,0 +1,40 @@
+<template>
+	<div v-if="status.sensitive == true">
+		<details class="details-animated">
+			<summary>
+				<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
+				<p class="font-weight-light">(click to show)</p>
+			</summary>
+			<b-carousel :id="status.id + '-carousel'"
+				style="text-shadow: 1px 1px 2px #333;"
+				controls
+				indicators
+				background="#ffffff"
+				:interval="0"
+			>
+				<b-carousel-slide v-for="(img, index) in status.media_attachments" :key="img.id">
+					<img slot="img" class="d-block img-fluid w-100" :src="img.url" :alt="img.description">
+				</b-carousel-slide>
+			</b-carousel>
+		</details>
+	</div>
+	<div v-else>
+		<b-carousel :id="status.id + '-carousel'"
+			style="text-shadow: 1px 1px 2px #333;"
+			controls
+			indicators
+			background="#ffffff"
+			:interval="0"
+		>
+			<b-carousel-slide v-for="(img, index) in status.media_attachments" :key="img.id">
+				<img slot="img" class="d-block img-fluid w-100" :src="img.url" :alt="img.description">
+			</b-carousel-slide>
+		</b-carousel>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: ['status']
+	}
+</script>
\ No newline at end of file
diff --git a/resources/assets/js/components/presenter/PhotoPresenter.vue b/resources/assets/js/components/presenter/PhotoPresenter.vue
new file mode 100644
index 000000000..91ecfa534
--- /dev/null
+++ b/resources/assets/js/components/presenter/PhotoPresenter.vue
@@ -0,0 +1,24 @@
+<template>
+	<div v-if="status.sensitive == true">
+		<details class="details-animated">
+			<summary>
+				<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
+				<p class="font-weight-light">(click to show)</p>
+			</summary>
+			<a class="max-hide-overflow" :href="status.url" :class="status.media_attachments[0].filter_class">
+				<img class="card-img-top" :src="status.media_attachments[0].url">
+			</a>
+		</details>
+	</div>
+	<div v-else>
+		<div :class="status.media_attachments[0].filter_class">
+			<img class="card-img-top" :src="status.media_attachments[0].url">
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: ['status']
+	}
+</script>
\ No newline at end of file
diff --git a/resources/assets/js/components/presenter/VideoAlbumPresenter.vue b/resources/assets/js/components/presenter/VideoAlbumPresenter.vue
new file mode 100644
index 000000000..7dbb0201f
--- /dev/null
+++ b/resources/assets/js/components/presenter/VideoAlbumPresenter.vue
@@ -0,0 +1,44 @@
+<template>
+	<div v-if="status.sensitive == true">
+		<details class="details-animated">
+			<summary>
+				<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
+				<p class="font-weight-light">(click to show)</p>
+			</summary>
+			<b-carousel :id="status.id + '-carousel'"
+				style="text-shadow: 1px 1px 2px #333; background-color: #000;"
+				controls
+				img-blank
+				background="#ffffff"
+				:interval="0"
+			>
+				<b-carousel-slide v-for="(vid, index) in status.media_attachments" :key="vid.id + '-media'">
+					<video slot="img" class="embed-responsive-item" preload="none" controls loop :alt="vid.description" width="100%" height="100%">
+						<source :src="vid.url" :type="vid.mime">
+					</video>
+				</b-carousel-slide>
+			</b-carousel>
+		</details>
+	</div>
+	<div v-else>
+		<b-carousel :id="status.id + '-carousel'"
+			style="text-shadow: 1px 1px 2px #333; background-color: #000;"
+			controls
+			img-blank
+			background="#ffffff"
+			:interval="0"
+		>
+			<b-carousel-slide v-for="(vid, index) in status.media_attachments" :key="vid.id + '-media'">
+				<video slot="img" class="embed-responsive-item" preload="none" controls loop :alt="vid.description" width="100%" height="100%">
+					<source :src="vid.url" :type="vid.mime">
+				</video>
+			</b-carousel-slide>
+		</b-carousel>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: ['status']
+	}
+</script>
\ No newline at end of file
diff --git a/resources/assets/js/components/presenter/VideoPresenter.vue b/resources/assets/js/components/presenter/VideoPresenter.vue
new file mode 100644
index 000000000..0d0038ad4
--- /dev/null
+++ b/resources/assets/js/components/presenter/VideoPresenter.vue
@@ -0,0 +1,26 @@
+<template>
+	<div v-if="status.sensitive == true">
+		<details class="details-animated">
+			<summary>
+				<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
+				<p class="font-weight-light">(click to show)</p>
+			</summary>
+			<div class="embed-responsive embed-responsive-16by9">
+				<video class="video" preload="none" controls loop>
+					<source :src="status.media_attachments[0].url" :type="status.media_attachments[0].mime">
+				</video>
+			</div>
+		</details>
+	</div>
+	<div v-else class="embed-responsive embed-responsive-16by9">
+		<video class="video" preload="none" controls loop>
+			<source :src="status.media_attachments[0].url" :type="status.media_attachments[0].mime">
+		</video>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: ['status']
+	}
+</script>
\ No newline at end of file

From e0d50b15cdeb441a6300d55c8236e4cfd69d9b4e Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 15 Dec 2018 22:21:32 -0700
Subject: [PATCH 08/11] Update Timeline.vue component, use presenter sub
 components

---
 resources/assets/js/components/Timeline.vue | 162 +-------------------
 1 file changed, 6 insertions(+), 156 deletions(-)

diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index 201289e7f..a748442b1 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -35,168 +35,23 @@
 
 				<div class="postPresenterContainer">
 					<div v-if="status.pf_type === 'photo'" class="w-100">
-						<div v-if="status.sensitive == true">
-							<details class="details-animated">
-								<summary>
-									<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
-									<p class="font-weight-light">(click to show)</p>
-								</summary>
-								<a class="max-hide-overflow" :href="status.url" :class="status.media_attachments[0].filter_class">
-									<img class="card-img-top" :src="status.media_attachments[0].url">
-								</a>
-							</details>
-						</div>
-						<div v-else>
-							<div :class="status.media_attachments[0].filter_class">
-								<img class="card-img-top" :src="status.media_attachments[0].url">
-							</div>
-						</div>
+						<photo-presenter :status="status"></photo-presenter>	
 					</div>
 
 					<div v-else-if="status.pf_type === 'video'" class="w-100">
-						<div v-if="status.sensitive == true">
-							<details class="details-animated">
-								<summary>
-									<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
-									<p class="font-weight-light">(click to show)</p>
-								</summary>
-								<div class="embed-responsive embed-responsive-16by9">
-									<video class="video" preload="none" controls loop>
-										<source :src="status.media_attachments[0].url" :type="status.media_attachments[0].mime">
-									</video>
-								</div>
-							</details>
-						</div>
-						<div v-else class="embed-responsive embed-responsive-16by9">
-							<video class="video" preload="none" controls loop>
-								<source :src="status.media_attachments[0].url" :type="status.media_attachments[0].mime">
-							</video>
-						</div>
+						<video-presenter :status="status"></video-presenter>
 					</div>
 
 					<div v-else-if="status.pf_type === 'photo:album'" class="w-100">
-						<div v-if="status.sensitive == true">
-							<details class="details-animated">
-								<summary>
-									<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
-									<p class="font-weight-light">(click to show)</p>
-								</summary>
-								<b-carousel :id="status.id + '-carousel'"
-									style="text-shadow: 1px 1px 2px #333;"
-									controls
-									indicators
-									background="#ffffff"
-									:interval="0"
-								>
-									<b-carousel-slide v-for="(img, index) in status.media_attachments" :key="img.id">
-										<img slot="img" class="d-block img-fluid w-100" :src="img.url" :alt="img.description">
-									</b-carousel-slide>
-								</b-carousel>
-							</details>
-						</div>
-						<div v-else>
-							<b-carousel :id="status.id + '-carousel'"
-								style="text-shadow: 1px 1px 2px #333;"
-								controls
-								indicators
-								background="#ffffff"
-								:interval="0"
-							>
-								<b-carousel-slide v-for="(img, index) in status.media_attachments" :key="img.id">
-									<img slot="img" class="d-block img-fluid w-100" :src="img.url" :alt="img.description">
-								</b-carousel-slide>
-							</b-carousel>
-						</div>
+						<photo-album-presenter :status="status"></photo-album-presenter>
 					</div>
 
 					<div v-else-if="status.pf_type === 'video:album'" class="w-100">
-						<div v-if="status.sensitive == true">
-							<details class="details-animated">
-								<summary>
-									<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
-									<p class="font-weight-light">(click to show)</p>
-								</summary>
-								<b-carousel :id="status.id + '-carousel'"
-									style="text-shadow: 1px 1px 2px #333; background-color: #000;"
-									controls
-									img-blank
-									background="#ffffff"
-									:interval="0"
-								>
-									<b-carousel-slide v-for="(vid, index) in status.media_attachments" :key="vid.id + '-media'">
-										<video slot="img" class="embed-responsive-item" preload="none" controls loop :alt="vid.description" width="100%" height="100%">
-											<source :src="vid.url" :type="vid.mime">
-										</video>
-									</b-carousel-slide>
-								</b-carousel>
-							</details>
-						</div>
-						<div v-else>
-							<b-carousel :id="status.id + '-carousel'"
-								style="text-shadow: 1px 1px 2px #333; background-color: #000;"
-								controls
-								img-blank
-								background="#ffffff"
-								:interval="0"
-							>
-								<b-carousel-slide v-for="(vid, index) in status.media_attachments" :key="vid.id + '-media'">
-									<video slot="img" class="embed-responsive-item" preload="none" controls loop :alt="vid.description" width="100%" height="100%">
-										<source :src="vid.url" :type="vid.mime">
-									</video>
-								</b-carousel-slide>
-							</b-carousel>
-						</div>
+						<video-album-presenter :status="status"></video-album-presenter>
 					</div>
 
 					<div v-else-if="status.pf_type === 'photo:video:album'" class="w-100">
-						<div v-if="status.sensitive == true">
-							<details class="details-animated">
-								<summary>
-									<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
-									<p class="font-weight-light">(click to show)</p>
-								</summary>
-								<b-carousel :id="status.id + '-carousel'"
-									style="text-shadow: 1px 1px 2px #333; background-color: #000;"
-									controls
-									img-blank
-									background="#ffffff"
-									:interval="0"
-								>
-									<b-carousel-slide v-for="(media, index) in status.media_attachments" :key="media.id + '-media'">
-
-										<video v-if="media.type == 'Video'" slot="img" class="embed-responsive-item" preload="none" controls loop :alt="media.description" width="100%" height="100%">
-											<source :src="media.url" :type="media.mime">
-										</video>
-
-										<img v-else-if="media.type == 'Image'" slot="img" class="d-block img-fluid w-100" :src="media.url" :alt="media.description">
-
-										<p v-else class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
-
-									</b-carousel-slide>
-								</b-carousel>
-							</details>
-						</div>
-						<div v-else>
-							<b-carousel :id="status.id + '-carousel'"
-										style="text-shadow: 1px 1px 2px #333; background-color: #000;"
-										controls
-										img-blank
-										background="#ffffff"
-										:interval="0"
-									>
-								<b-carousel-slide v-for="(media, index) in status.media_attachments" :key="media.id + '-media'">
-
-									<video v-if="media.type == 'Video'" slot="img" class="embed-responsive-item" preload="none" controls loop :alt="media.description" width="100%" height="100%">
-										<source :src="media.url" :type="media.mime">
-									</video>
-
-									<img v-else-if="media.type == 'Image'" slot="img" class="d-block img-fluid w-100" :src="media.url" :alt="media.description">
-
-									<p v-else class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
-
-								</b-carousel-slide>
-							</b-carousel>
-						</div>
+						<mixed-album-presenter :status="status"></mixed-album-presenter>
 					</div>
 
 					<div v-else class="w-100">
@@ -345,12 +200,7 @@
 	.postPresenterContainer {
 		display: flex;
 		align-items: center;
-		background: #000;
-	}
-	@media(min-width: 720px) {
-		.postPresenterContainer {
-			min-height: 600px;
-		}
+		background: #fff;
 	}
 	.cursor-pointer {
 		cursor: pointer;

From e54e8727d6283430170802892cfa006cf0bcd20e Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 15 Dec 2018 22:25:00 -0700
Subject: [PATCH 09/11] Update PostComponent.vue

---
 .../assets/js/components/PostComponent.vue    | 231 +++---------------
 1 file changed, 30 insertions(+), 201 deletions(-)

diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue
index 97bc943d0..c3b9f6258 100644
--- a/resources/assets/js/components/PostComponent.vue
+++ b/resources/assets/js/components/PostComponent.vue
@@ -10,10 +10,11 @@
 .col-md-4 {
   background: #fff;
 }
-
+.postPresenterContainer {
+  background: #fff;
+}
 @media(min-width: 720px) {
   .postPresenterContainer {
-    background: #000;
     min-height: 600px;
   }
 }
@@ -57,8 +58,30 @@
             <div class="postPresenterLoader text-center">
               <div class="lds-ring"><div></div><div></div><div></div><div></div></div> 
             </div>
-            <div class="postPresenterContainer d-none">
+            <div class="postPresenterContainer d-none d-flex justify-content-center align-items-center">
+              <div v-if="status.pf_type === 'photo'" class="w-100">
+                <photo-presenter :status="status"></photo-presenter>  
+              </div>
 
+              <div v-else-if="status.pf_type === 'video'" class="w-100">
+                <video-presenter :status="status"></video-presenter>
+              </div>
+
+              <div v-else-if="status.pf_type === 'photo:album'" class="w-100">
+                <photo-album-presenter :status="status"></photo-album-presenter>
+              </div>
+
+              <div v-else-if="status.pf_type === 'video:album'" class="w-100">
+                <video-album-presenter :status="status"></video-album-presenter>
+              </div>
+
+              <div v-else-if="status.pf_type === 'photo:video:album'" class="w-100">
+                <mixed-album-presenter :status="status"></mixed-album-presenter>
+              </div>
+
+              <div v-else class="w-100">
+                <p class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
+              </div>
             </div>
         </div>
 
@@ -210,153 +233,6 @@
 
 pixelfed.postComponent = {};
 
-pixelfed.presenter = {
-  show: {
-    image: function(container, media, status) {
-      $('.status-container')
-        .removeClass('orientation-unknown')
-        .addClass('orientation-' + media[0]['orientation']);
-      let wrapper = $('<div>');
-      container.addClass('d-flex align-items-center');
-      if(media[0]['filter_class']) {
-        wrapper.addClass(media[0]['filter_class']);
-      }
-      let el = $('<img>');
-      el.attr('src', media[0]['url']);
-      el.attr('title', media[0]['description']);
-      el.addClass('img-fluid');
-      wrapper.append(el);
-      if(status.sensitive == true) {
-        let spoilerText = status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media';
-        let cw = $('<details>').addClass('details-animated w-100');
-        let summary = $('<summary>');
-        let text = $('<p>').addClass('mb-0 lead font-weight-bold').text(spoilerText);
-        let direction = $('<p>').addClass('font-weight-light').text('(click to show)');
-        summary.append(text, direction);
-        cw.append(summary, wrapper);
-        container.append(cw);
-      } else {
-        container.append(wrapper);
-      }
-    },
-
-    video: function(container, media, status) {
-      let wrapper = $('<div>');
-      container.addClass('d-flex align-items-center');
-      let el = $('<video>');
-      el.addClass('embed-responsive-item');
-      el.attr('controls', '');
-      el.attr('loop', '');
-      el.attr('src', media[0]['url']);
-      el.attr('title', media[0]['description']);
-      wrapper.append(el);
-      if(status.sensitive == true) {
-        let spoilerText = status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media';
-        let cw = $('<details>').addClass('details-animated w-100');
-        let summary = $('<summary>');
-        let text = $('<p>').addClass('mb-0 lead font-weight-bold').text(spoilerText);
-        let direction = $('<p>').addClass('font-weight-light').text('(click to show)');
-        summary.append(text, direction);
-        cw.append(summary, wrapper);
-        container.append(cw);
-      } else {
-        container.append(wrapper);
-      }
-      
-      const player = new Plyr(el, {
-        controls: [
-            'restart', // Restart playback
-            'play', // Play/pause playback
-            'progress', // The progress bar and scrubber for playback and buffering
-            'current-time', // The current time of playback
-            'duration', // The full duration of the media
-            'volume', // Volume control
-            'captions', // Toggle captions
-            'settings', // Settings menu
-            'fullscreen', // Toggle fullscreen
-        ]
-      });
-      player.volume = 0.75;
-    },
-
-    imageAlbum: function(container, media, status) {
-      $('.status-container')
-        .removeClass('orientation-unknown')
-        .addClass('orientation-' + media[0]['orientation']);
-      let id = 'photo-carousel-wrapper-' + status.id;
-      let wrapper = $('<div>');
-      container.addClass('d-flex align-items-center');
-      wrapper.addClass('carousel slide carousel-fade');
-      wrapper.attr('data-ride', 'carousel');
-      wrapper.attr('id', id);
-      let indicators = $('<ol>');
-      indicators.addClass('carousel-indicators');
-      let prev = $('<a>');
-      prev.addClass('carousel-control-prev');
-      prev.attr('href', '#' + id);
-      prev.attr('role', 'button');
-      prev.attr('data-slide', 'prev');
-      let prevIcon = $('<span>').addClass('carousel-control-prev-icon').attr('aria-hidden', 'true');
-      let prevSr = $('<span>').addClass('sr-only');
-      prev.append(prevIcon, prevSr);
-      let next = $('<a>');
-      next.addClass('carousel-control-next');
-      next.attr('href', '#' + id);
-      next.attr('role', 'button');
-      next.attr('data-slide', 'next');
-      let nextIcon = $('<span>').addClass('carousel-control-next-icon').attr('aria-hidden', 'true');
-      let nextSr = $('<span>').addClass('sr-only');
-      let inner = $('<div>').addClass('carousel-inner');
-      next.append(nextIcon, nextSr);
-      for(let i = 0; i < media.length; i++) {
-        let li = $('<li>');
-        li.attr('data-target', '#' + id);
-        li.attr('data-slide-to', i);
-        if(i == 0) {
-          li.addClass('active');
-        }
-        indicators.append(li);
-        let item = media[i];
-        let carouselItem = $('<div>').addClass('carousel-item');
-        if(i == 0) {
-          carouselItem.addClass('active');
-        }
-        let figure = $('<figure>');
-        if(item['filter_class']) {
-          figure.addClass(item['filter_class']);
-        }
-
-        let badge = $('<span>');
-        badge.addClass('float-right mr-3 badge badge-dark');
-        badge.style = 'position:fixed;top:8px;right:0;margin-bottom:-20px;';
-        badge.text(i+1 + '/' + media.length);
-
-        let img = $('<img>');
-        img.addClass('d-block w-100');
-        img.attr('src', item['url']);
-
-        figure.append(badge, img);
-        carouselItem.append(figure);
-
-        inner.append(carouselItem);
-      }
-      wrapper.append(indicators, inner, prev, next);
-      if(status.sensitive == true) {
-        let spoilerText = status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media';
-        let cw = $('<details>').addClass('details-animated w-100');
-        let summary = $('<summary>');
-        let text = $('<p>').addClass('mb-0 lead font-weight-bold').text(spoilerText);
-        let direction = $('<p>').addClass('font-weight-light').text('(click to show)');
-        summary.append(text, direction);
-        cw.append(summary, wrapper);
-        container.append(cw);
-      } else {
-        container.append(wrapper);
-      }
-    }
-  }
-};
-
 export default {
     props: ['status-id', 'status-username', 'status-template', 'status-url', 'status-profile-url', 'status-avatar'],
     data() {
@@ -454,10 +330,13 @@ export default {
                 self.shares = response.data.shares;
                 self.likesPage = 2;
                 self.sharesPage = 2;
-                this.buildPresenter();
+                //this.buildPresenter();
                 this.showMuteBlock();
                 loader.hide();
+                pixelfed.readmore();
                 $('.postComponent').removeClass('d-none');
+                $('.postPresenterLoader').addClass('d-none');
+                $('.postPresenterContainer').removeClass('d-none');
             }).catch(error => {
               if(!error.response) {
                 $('.postPresenterLoader .lds-ring').attr('style','width:100%').addClass('pt-4 font-weight-bold text-muted').text('An error occured, cannot fetch media. Please try again later.');
@@ -529,56 +408,6 @@ export default {
         });
       },
 
-      buildPresenter() {
-        let container = $('.postPresenterContainer');
-        let status = this.status;
-        let media = this.media;
-
-        $('input[name="item"]').each(function(k, v) {
-            let el = $(v);
-            el.val(status.account.id);
-        });
-
-        if(container.children().length != 0) {
-          return;
-        }
-
-        let template = this.status.pf_type ? this.status.pf_type : this.statusTemplate;
-        switch(template) {
-          case 'image':
-          case 'photo':
-            pixelfed.presenter.show.image(container, media, this.status);
-          break;
-
-          case 'album':
-          case 'photo:album':
-            pixelfed.presenter.show.imageAlbum(container, media, this.status);
-          break;
-
-          case 'video':
-            pixelfed.presenter.show.video(container, media, this.status);
-          break;
-
-          case 'video:album':
-          case 'photo:video:album':
-              $('.postPresenterLoader .lds-ring').attr('style','width:100%').addClass('pt-4 font-weight-bold text-muted').text('We cannot load this post properly. We\'re working on a fix!');
-                return;
-          break;
-
-          default:
-              $('.postPresenterLoader .lds-ring').attr('style','width:100%').addClass('pt-4 font-weight-bold text-muted').text('An error occured, cannot fetch media. Please try again later.');
-          break;
-
-        }
-        if(container.children().length == 0) {
-          $('.postPresenterLoader .lds-ring').attr('style','width:100%').addClass('pt-4 font-weight-bold text-muted').text('An error occured, cannot fetch media. Please try again later.');
-          return;
-        }
-        pixelfed.readmore();
-        $('.postPresenterLoader').addClass('d-none');
-        $('.postPresenterContainer').removeClass('d-none');
-      },
-
       likeStatus(event) {
         if($('body').hasClass('loggedIn') == false) {
           return;

From d23e8f57d8b94454cb5875a93058c8fbc4e75cd2 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 15 Dec 2018 22:25:43 -0700
Subject: [PATCH 10/11] Update compiled assets

---
 public/js/components.js  | Bin 586819 -> 585614 bytes
 public/mix-manifest.json | Bin 321 -> 321 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/components.js b/public/js/components.js
index c3710b463261eb9450852b9607c4299364cfbce4..a9e3316096fe98c4f800195f0d8623d3e43a1514 100644
GIT binary patch
delta 3836
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

delta 5775
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
SkO3-t&jTIST=t%4p6fpxfSIiT

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index eab4ebc81521aa8e02ca8c49b8720b5d0476dd74..e9e09657d86aa4fc76eda843a30b1785d359dff2 100644
GIT binary patch
delta 30
lcmX@ebdYI+p-7r}Qd)AFSyGybMN+bnv1yXINzz2uKLDFq3RD09

delta 30
lcmX@ebdYI+p@^kPVxp;~Nvfftfr+t&QIdhNMao3iKLChn2`B&n


From 2336d09cd01feea708e5ead0f6c9f2154cf17718 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 15 Dec 2018 22:26:07 -0700
Subject: [PATCH 11/11] Bump version to 0.5.9

---
 config/pixelfed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/pixelfed.php b/config/pixelfed.php
index 75abda221..32330e463 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.8',
+    'version' => '0.5.9',
 
     /*
     |--------------------------------------------------------------------------