From 37d9951a418f339f40c7df1cadc2ec86cbb9c053 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 4 Jun 2019 18:19:41 -0600
Subject: [PATCH 1/6] Closes #1345

---
 resources/views/admin/pages/home.blade.php           |  4 ++--
 resources/views/admin/settings/backups.blade.php     |  2 +-
 resources/views/admin/settings/config.blade.php      | 11 ++++++-----
 resources/views/admin/settings/features.blade.php    |  2 +-
 resources/views/admin/settings/maintenance.blade.php |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/resources/views/admin/pages/home.blade.php b/resources/views/admin/pages/home.blade.php
index aeccb9e2e..9bd2b9a93 100644
--- a/resources/views/admin/pages/home.blade.php
+++ b/resources/views/admin/pages/home.blade.php
@@ -9,9 +9,9 @@
   </div>
   <hr>
   <p class="alert alert-warning">
-    <strong>Feature Unavailable:</strong> This feature will be released in v0.9.0.
+    <strong>Feature Unavailable:</strong> This feature will be released in a future version.
   </p>
-  {{--< div class="table-responsive">
+  {{-- <div class="table-responsive">
     <table class="table">
       <thead class="bg-light">
         <tr class="text-center">
diff --git a/resources/views/admin/settings/backups.blade.php b/resources/views/admin/settings/backups.blade.php
index aff9a5695..0b0a2765e 100644
--- a/resources/views/admin/settings/backups.blade.php
+++ b/resources/views/admin/settings/backups.blade.php
@@ -9,6 +9,6 @@
   </div>
   <hr>
   <p class="alert alert-warning">
-    <strong>Feature Unavailable:</strong> This feature will be released in v0.9.0.
+    <strong>Feature Unavailable:</strong> This feature will be released in a future version.
   </p>
 @endsection
\ No newline at end of file
diff --git a/resources/views/admin/settings/config.blade.php b/resources/views/admin/settings/config.blade.php
index b13b89bf3..8a9d017d0 100644
--- a/resources/views/admin/settings/config.blade.php
+++ b/resources/views/admin/settings/config.blade.php
@@ -5,9 +5,10 @@
 @section('section')
   <div class="title">
     <h3 class="font-weight-bold">Configuration Settings</h3>
-    <p class="lead">Edit any .env or config setting</p>
-    <hr>
-    <p class="alert alert-warning">
-      <strong>Feature Unavailable:</strong> This feature will be released in v0.9.0.
-    </p>
+    <p class="lead">Edit configuration settings</p>
+  </div>
+  <hr>
+  <p class="alert alert-warning">
+    <strong>Feature Unavailable:</strong> This feature will be released in a future version.
+  </p>
 @endsection
\ No newline at end of file
diff --git a/resources/views/admin/settings/features.blade.php b/resources/views/admin/settings/features.blade.php
index e393b090d..f3a9f59e7 100644
--- a/resources/views/admin/settings/features.blade.php
+++ b/resources/views/admin/settings/features.blade.php
@@ -9,6 +9,6 @@
   </div>
   <hr>
   <p class="alert alert-warning">
-    <strong>Feature Unavailable:</strong> This feature will be released in v0.9.0.
+    <strong>Feature Unavailable:</strong> This feature will be released in a future version.
   </p>
 @endsection
\ No newline at end of file
diff --git a/resources/views/admin/settings/maintenance.blade.php b/resources/views/admin/settings/maintenance.blade.php
index a89b55f43..39c79849c 100644
--- a/resources/views/admin/settings/maintenance.blade.php
+++ b/resources/views/admin/settings/maintenance.blade.php
@@ -9,6 +9,6 @@
 </div>
 <hr>
 <p class="alert alert-warning">
-	<strong>Feature Unavailable:</strong> This feature will be released in v0.9.0.
+	<strong>Feature Unavailable:</strong> This feature will be released in a future version.
 </p>
 @endsection
\ No newline at end of file

From 1814096f75a8dd50863b68bb3e53ec61f18ab584 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 4 Jun 2019 21:45:53 -0600
Subject: [PATCH 2/6] Update DiscoverComponent

---
 .../assets/js/components/DiscoverComponent.vue   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/components/DiscoverComponent.vue b/resources/assets/js/components/DiscoverComponent.vue
index 61f0bcc97..0fae3c89d 100644
--- a/resources/assets/js/components/DiscoverComponent.vue
+++ b/resources/assets/js/components/DiscoverComponent.vue
@@ -22,8 +22,12 @@
       <div class="row d-none">
         <div class="col-4 p-0 p-sm-2 p-md-3" v-for="post in posts">
           <a class="card info-overlay card-md-border-0" :href="post.url">
-            <div class="square filter_class">
-              <div class="square-content" v-bind:style="{ 'background-image': 'url(' + post.thumb + ')' }"></div>
+            <div class="square">
+              <span v-if="post.type == 'photo:album'" class="float-right mr-3 post-icon"><i class="fas fa-images fa-2x"></i></span>
+              <span v-if="post.type == 'video'" class="float-right mr-3 post-icon"><i class="fas fa-video fa-2x"></i></span>
+              <span v-if="post.type == 'video:album'" class="float-right mr-3 post-icon"><i class="fas fa-film fa-2x"></i></span>
+              <div class="square-content" v-bind:style="{ 'background-image': 'url(' + post.thumb + ')' }">
+              </div>
             </div>
           </a>
         </div>
@@ -46,6 +50,14 @@
     height:100px;
     background-size: cover !important;
   }
+  .post-icon {
+    color: #fff;
+    position:relative;
+    margin-top: 10px;
+    z-index: 9;
+    opacity: 0.6;
+    text-shadow: 3px 3px 16px #272634;
+  }
 </style>
 
 <script type="text/javascript">

From a0fdee5a72c5e1328878ac0f1f513d2a36e0fc1e Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 4 Jun 2019 21:46:53 -0600
Subject: [PATCH 3/6] Update InternalApiController

---
 app/Http/Controllers/InternalApiController.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/Http/Controllers/InternalApiController.php b/app/Http/Controllers/InternalApiController.php
index 5ed7bbafe..6c8e4befa 100644
--- a/app/Http/Controllers/InternalApiController.php
+++ b/app/Http/Controllers/InternalApiController.php
@@ -113,10 +113,7 @@ class InternalApiController extends Controller
                 'type'
               )
               ->whereNull('uri')
-              ->whereHas('media')
-              ->whereHas('profile', function($q) {
-                return $q->whereNull('status');
-              })
+              ->whereIn('type', ['photo','photo:album', 'video'])
               ->whereIsNsfw(false)
               ->whereVisibility('public')
               ->whereNotIn('profile_id', $following)

From 74ead1dc775a1d9b15f7b037f93c84673ea3cc97 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 4 Jun 2019 21:47:25 -0600
Subject: [PATCH 4/6] Update RestrictedNames

---
 app/Util/Lexer/RestrictedNames.php | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/Util/Lexer/RestrictedNames.php b/app/Util/Lexer/RestrictedNames.php
index 61bc07e5c..92eec60fb 100644
--- a/app/Util/Lexer/RestrictedNames.php
+++ b/app/Util/Lexer/RestrictedNames.php
@@ -12,9 +12,6 @@ class RestrictedNames
      'autoconfig',
      'blog',
      'broadcasthost',
-     'contact',
-     'contact-us',
-     'contact_us',
      'copyright',
      'download',
      'domainadmin',
@@ -111,19 +108,23 @@ class RestrictedNames
      'booth',
      'bouncer',
      'c',
-     'css',
+     'cdn',
      'circle',
      'circles',
      'checkpoint',
-     'community',
-     'communities',
      'collection',
      'collections',
+     'community',
+     'communities',
+     'contact',
+     'contact-us',
+     'contact_us',
      'costar',
      'costars',
-     'cdn',
+     'css',
      'd',
      'dashboard',
+     'db',
      'deck',
      'dev',
      'developer',
@@ -143,8 +144,10 @@ class RestrictedNames
      'fonts',
      'g',
      'gdpr',
+     'graph',
      'group',
      'groups',
+     'h',
      'home',
      'help',
      'helpcenter',
@@ -162,10 +165,15 @@ class RestrictedNames
      'invite',
      'invites',
      'js',
+     'l',
      'lab',
      'labs',
      'legal',
      'live',
+     'loop',
+     'loops',
+     'location',
+     'locations',
      'login',
      'logout',
      'm',
@@ -183,6 +191,8 @@ class RestrictedNames
      'p',
      'page',
      'pages',
+     'pin',
+     'pins',
      'photo',
      'photos',
      'password',
@@ -212,6 +222,7 @@ class RestrictedNames
      'timeline',
      'timelines',
      'tour',
+     'tv',
      'user',
      'users',
      'username',

From c402f751138f0f05346351af3fb88bc3afd0851e Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 4 Jun 2019 21:47:48 -0600
Subject: [PATCH 5/6] Add new instance config

---
 config/instance.php | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 config/instance.php

diff --git a/config/instance.php b/config/instance.php
new file mode 100644
index 000000000..53d6242c7
--- /dev/null
+++ b/config/instance.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+	'email' => env('INSTANCE_CONTACT_EMAIL'),
+];
\ No newline at end of file

From 71c694b999ab3fef65f5a11821b0c4625838291f Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 4 Jun 2019 21:48:29 -0600
Subject: [PATCH 6/6] Update compiled assets

---
 public/js/components.js  | Bin 533083 -> 533093 bytes
 public/js/discover.js    | Bin 11099 -> 11651 bytes
 public/mix-manifest.json | Bin 905 -> 905 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/components.js b/public/js/components.js
index 25bcffc97ea0e3ceb91b26c44db912298470c309..b8f87192b16c77e1d42d2bfd1c7845bbecbb119b 100644
GIT binary patch
delta 44
zcmcb8MB(WXg@zW!7N!>F7M3lnyXv`g$}&?@^YwEJOxkzVvjQ>O_FeVt3l{+ZoP-i*

delta 33
ocmaEQMB(-kg@zW!7N!>F7M3lnyXxDI)UyIH+x8>%><bqG0RI#Y_y7O^

diff --git a/public/js/discover.js b/public/js/discover.js
index 3f41c785f32720424e0405bcad128477a1b1df81..c737c8ea6a4eaef635d8b3119e3321bea515af68 100644
GIT binary patch
delta 766
zcmcJNziSjh6vv5KO@tIF?!<t|Fllz;?vmVHE;z>_C@Lt3M6kIWGVaaZ4eZX0Gjr=+
zj`a!~`>iePEQPHs{1XIwYYYDf!PyDMLM&4Z^WNjVFQ510`}4P>PaB?hc=Rl*rs&D$
zVUPBDv`eZl=<Z)<V=rDsQfL#hSn$z=7!u~;pWHE6o^SwSkqU*uZjvN}#<%&*Fu}2+
zDKRXkE}9WFWjr)OVsNl83l}^M8K2MsgWJv(lElm`FxZd!E?{VZOsHpMB3@(Am4$l;
zeQWG?jynBr&!&|p90m}M>viwrCVWaC5S+|;+#vWSpaDnAoG74%+=s5;Z+q`92gm90
z!|KD;oAuYN({(Ri+<#O*-hS_`(duXG%@rEWRa#cEwX@Q%=0s6g1|ukE!U#;#m-7q`
zhcq$^N$*%yEr~@~YGd1t@1;a*43kt46Dl^H8IY;4+l=LGjE$5nV*gYS4H6Qvj7+Js
zIt47zYK*XnUQize_RD<;APQj4CRAJ;gOhJyI>pK|{2$?>hmo+YG&=)nII5_1t<vqC
q>T~<n8m)h{i%aLnTGQ*lw%sC|wca>id2<jD4S2+Tg(6axXz&~D;QSW=

delta 220
zcmZpUz8$uKon`Yb)+HR9Ir-->v*f2Z8f{)FG?#_BM6-I5u>9l<@mRJJz0#tb+R5j{
zB!!C$OB0Jy71A<uN>YpBlXDV_izlBIlbSqD(vY!a^9jicCJqzxWW!{06O+vzGJgeF
zm2wTTv?p`3_`$^|C$cypIICHbd6aaNlwvh&bwHL+=H-{ODN8I;D6-AdP^ySXEmqRB
t&eO}&DALqRtknStSf!QbC6{F8=V_Gar0V2pR>PHp?P}obV6N4)1^^^fMh^f0

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 9306914da9580918d60df2dc08ff2aaa24ed406f..88cdd01b40428c816a012a1c7e28982b45c7b0af 100644
GIT binary patch
delta 58
zcmeBV?_}SQ&nS|Tl5A*fnv`s8XlZI_VrXV)ZeTdMnQ@DVQA#opnHv}<8Yh|=nWm%}
MCYo;cX0l@h0O8ya5&!@I

delta 58
zcmeBV?_}SQ&nRMKnqpvKWM*P)Xljs}YHkUnk|#GaZV@psGcq-{Ff}r?FtIdFH8nL$
MPEOwJ&1A<20Ko?j6aWAK