Merge branch 'dev' of https://github.com/dansup/pixelfed into dev

app/Http/Controllers/TimelineController.php

@@ -20,6 +20,7 @@ class TimelineController extends Controller
       $following->push(Auth::user()->profile->id);
       $timeline = Status::whereIn('profile_id', $following)
                   ->orderBy('id','desc')
+                  ->withCount(['comments', 'likes'])
                   ->simplePaginate(20);
       $type = 'personal';
       return view('timeline.template', compact('timeline', 'type'));
@@ -31,6 +32,7 @@ class TimelineController extends Controller
       // $timeline = Timeline::build()->local();
       $timeline = Status::whereHas('media')
                   ->whereNull('in_reply_to_id')
+                  ->withCount(['comments', 'likes'])
                   ->orderBy('id','desc')
                   ->simplePaginate(20);
       $type = 'local';

app/Util/Lexer/RestrictedNames.php

@@ -17,7 +17,6 @@ class RestrictedNames {
      "contact-us",
      "contact_us",
      "copyright",
-     "css",
      "d",
      "dashboard",
      "dev",
@@ -52,7 +51,6 @@ class RestrictedNames {
      "is",
      "isatap",
      "it",
-     "js",
      "localdomain",
      "localhost",
      "mail",
@@ -127,24 +125,35 @@ class RestrictedNames {
      "account",
      "api",
      "auth",
+     "css",
+     "c",
      "i",
      "dashboard",
+     "deck",
      "discover",
      "docs",
+     "fonts",
      "home",
+     "img",
+     "js",
      "login",
      "logout",
      "media",
      "p",
      "password",
+     "report",
      "reports",
      "search",
      "settings",
      "statuses",
      "site",
+     "sites",
      "timeline",
+     "timelines",
+     "tour",
      "user",
      "users",
+     "vendor",
      "400",
      "401",
      "403",

resources/lang/oc/navmenu.php

@@ -9,5 +9,6 @@ return [
     'settings' => 'Paramètres',
     'admin' => 'Admin',
     'logout' => 'Desconnexion',
+    'directMessages' => 'Messatges dirèctes',
 
 ];

resources/lang/oc/profile.php

@@ -4,5 +4,6 @@ return [
   'emptyTimeline' => 'Aqueste utilizaire a pas encara de publicacion !',
   'emptyFollowers' => 'Aqueste utilizaire a pas encara pas seguidors !',
   'emptyFollowing' => 'Aqueste utilizaire sèc degun pel moment !',
+  'emptySaved' => 'Avètz cap de publicacion salvagardas pel moment !',
   'savedWarning'  => 'Solament vos vesètz çò que salvagardatz',
 ];