From d22c7b9483fb0d007a450003af404c016f4e6ab6 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 17 Nov 2019 13:15:15 -0700
Subject: [PATCH 1/3] Update settings, use consistent button styling

---
 resources/views/settings/accessibility.blade.php | 2 +-
 resources/views/settings/email.blade.php         | 2 +-
 resources/views/settings/home.blade.php          | 2 +-
 resources/views/settings/password.blade.php      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/settings/accessibility.blade.php b/resources/views/settings/accessibility.blade.php
index 53466edd..92c8b671 100644
--- a/resources/views/settings/accessibility.blade.php
+++ b/resources/views/settings/accessibility.blade.php
@@ -53,7 +53,7 @@
     <div class="form-group row mt-5 pt-5">
       <div class="col-12 text-right">
         <hr>
-        <button type="submit" class="btn btn-primary font-weight-bold">Submit</button>
+        <button type="submit" class="btn btn-primary font-weight-bold py-0 px-5">Submit</button>
       </div>
     </div>
   </form>
diff --git a/resources/views/settings/email.blade.php b/resources/views/settings/email.blade.php
index ac7e6d84..b86bbe7b 100644
--- a/resources/views/settings/email.blade.php
+++ b/resources/views/settings/email.blade.php
@@ -28,7 +28,7 @@
     <hr>
     <div class="form-group row">
       <div class="col-12 text-right">
-        <button type="submit" class="btn btn-primary font-weight-bold float-right">Submit</button>
+        <button type="submit" class="btn btn-primary font-weight-bold py-0 px-5">Submit</button>
       </div>
     </div>
   </form>
diff --git a/resources/views/settings/home.blade.php b/resources/views/settings/home.blade.php
index 12016533..514b3adc 100644
--- a/resources/views/settings/home.blade.php
+++ b/resources/views/settings/home.blade.php
@@ -95,7 +95,7 @@
     <hr>
     <div class="form-group row">
       <div class="col-12 text-right">
-        <button type="submit" class="btn btn-primary font-weight-bold float-right">Submit</button>
+        <button type="submit" class="btn btn-primary font-weight-bold py-0 px-5">Submit</button>
       </div>
     </div>
   </form>
diff --git a/resources/views/settings/password.blade.php b/resources/views/settings/password.blade.php
index 0cc584cb..6070a92c 100644
--- a/resources/views/settings/password.blade.php
+++ b/resources/views/settings/password.blade.php
@@ -29,8 +29,8 @@
     </div>
     <hr>
     <div class="form-group row">
-      <div class="col-sm-9">
-        <button type="submit" class="btn btn-primary">Submit</button>
+      <div class="col-12 text-right">
+        <button type="submit" class="btn btn-primary font-weight-bold py-0 px-5">Submit</button>
       </div>
     </div>
   </form>

From 326b9a9885765a263be772609d31d691a255e48f Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Mon, 18 Nov 2019 19:18:58 -0700
Subject: [PATCH 2/3] Update site localization

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

diff --git a/resources/lang/en/site.php b/resources/lang/en/site.php
index 2aa54ef8..bb8a408b 100644
--- a/resources/lang/en/site.php
+++ b/resources/lang/en/site.php
@@ -15,5 +15,6 @@ return [
     'contact'           => 'Contact',
     'contact-us'        => 'Contact Us',
     'places'            => 'Places',
+    'profiles'          => 'Profiles',
 
 ];

From 256f6b3515678bff07da21d4a602401eb1d14127 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Thu, 21 Nov 2019 20:59:55 -0700
Subject: [PATCH 3/3] Update StatusTransformer

---
 app/Transformer/Api/StatusTransformer.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Transformer/Api/StatusTransformer.php b/app/Transformer/Api/StatusTransformer.php
index 7d73c5f6..5a8fb0ba 100644
--- a/app/Transformer/Api/StatusTransformer.php
+++ b/app/Transformer/Api/StatusTransformer.php
@@ -23,6 +23,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
             'in_reply_to_account_id'    => $status->in_reply_to_profile_id,
             'reblog'                    => null,
             'content'                   => $status->rendered ?? $status->caption,
+            'content_text'              => $status->caption,
             'created_at'                => $status->created_at->format('c'),
             'emojis'                    => [],
             'reblogs_count'             => $status->reblogs_count ?? 0,
@@ -62,7 +63,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
     public function includeMediaAttachments(Status $status)
     {
         return Cache::remember('status:transformer:media:attachments:'.$status->id, now()->addDays(14), function() use($status) {
-            if(in_array($status->type, ['photo', 'video', 'photo:album', 'loop', 'photo:video:album'])) {
+            if(in_array($status->type, ['photo', 'video', 'video:album', 'photo:album', 'loop', 'photo:video:album'])) {
                 $media = $status->media()->orderBy('order')->get();
                 return $this->collection($media, new MediaTransformer());
             }