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) 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', 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 @@ + env('INSTANCE_CONTACT_EMAIL'), +]; \ No newline at end of file diff --git a/public/js/components.js b/public/js/components.js index 25bcffc97..b8f87192b 100644 Binary files a/public/js/components.js and b/public/js/components.js differ diff --git a/public/js/discover.js b/public/js/discover.js index 3f41c785f..c737c8ea6 100644 Binary files a/public/js/discover.js and b/public/js/discover.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 9306914da..88cdd01b4 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ 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 @@