diff --git a/app/Util/Lexer/RestrictedNames.php b/app/Util/Lexer/RestrictedNames.php index 59965d970..1e09a11c3 100644 --- a/app/Util/Lexer/RestrictedNames.php +++ b/app/Util/Lexer/RestrictedNames.php @@ -152,7 +152,11 @@ class RestrictedNames 'imgs', 'image', 'images', + 'invite', + 'invites', 'js', + 'lab', + 'labs', 'legal', 'live', 'login', diff --git a/public/js/timeline.js b/public/js/timeline.js index f1f6f2c1e..1cd4744dc 100644 Binary files a/public/js/timeline.js and b/public/js/timeline.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 0ab8dd828..44921ef61 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index c9c19c4b2..bc6b82736 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -166,12 +166,12 @@ avatar -
+

@{{profile.username}}

-

{{profile.display_name}}

+

{{profile.display_name}}

-
+
@@ -353,6 +353,9 @@ } else { window.ls.set('pixelfed-classicui-settings', this.modes); } + if(cachedSettings.notify == true) { + this.fetchNotifications(); + } }); }, @@ -367,7 +370,6 @@ $('.profile-card .loader').addClass('d-none'); $('.profile-card .contents').removeClass('d-none'); $('.profile-card .card-footer').removeClass('d-none'); - this.fetchNotifications(); }).catch(err => { swal( 'Oops, something went wrong',