From 0ba115f232f7b7db42be472b9f9f9b839a6d1c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Quent=C3=AD?= <33203663+Quenty31@users.noreply.github.com>
Date: Wed, 15 Aug 2018 13:51:21 +0200
Subject: [PATCH 1/4] Update (DM)

---
 resources/lang/oc/navmenu.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/oc/navmenu.php b/resources/lang/oc/navmenu.php
index f40edaab5..ccfe0f70d 100644
--- a/resources/lang/oc/navmenu.php
+++ b/resources/lang/oc/navmenu.php
@@ -9,5 +9,6 @@ return [
     'settings' => 'Paramètres',
     'admin' => 'Admin',
     'logout' => 'Desconnexion',
+    'directMessages' => 'Messatges dirèctes',
 
 ];

From ab71a8ef367b6c7d4fc8055a0b096e454e141c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Quent=C3=AD?= <33203663+Quenty31@users.noreply.github.com>
Date: Wed, 15 Aug 2018 13:53:20 +0200
Subject: [PATCH 2/4] Update (empty post)

---
 resources/lang/oc/profile.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/oc/profile.php b/resources/lang/oc/profile.php
index 473eac3bb..a6d2ec8d5 100644
--- a/resources/lang/oc/profile.php
+++ b/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',
 ];

From 5f1342819714391f070b03cf33133ea6c39f4045 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 15 Aug 2018 20:03:32 -0600
Subject: [PATCH 3/4] Update TimelineController

---
 app/Http/Controllers/TimelineController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Http/Controllers/TimelineController.php b/app/Http/Controllers/TimelineController.php
index 7424e3db6..5cc84530e 100644
--- a/app/Http/Controllers/TimelineController.php
+++ b/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';

From 3b4ea92d827f6e418914d7ad9d843d3e5d2425ce Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Thu, 16 Aug 2018 03:15:13 -0600
Subject: [PATCH 4/4] Update RestrictedNames

---
 app/Util/Lexer/RestrictedNames.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Util/Lexer/RestrictedNames.php b/app/Util/Lexer/RestrictedNames.php
index e2cd972d6..c2a851b1b 100644
--- a/app/Util/Lexer/RestrictedNames.php
+++ b/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",