From 109704f870d17d0572bd82e252dc8c01e3999c0b Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 2 Sep 2018 00:40:10 -0600
Subject: [PATCH 1/2] Update status sidebar view

---
 resources/views/status/show/sidebar.blade.php | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/resources/views/status/show/sidebar.blade.php b/resources/views/status/show/sidebar.blade.php
index 0c245375c..1fc98c147 100644
--- a/resources/views/status/show/sidebar.blade.php
+++ b/resources/views/status/show/sidebar.blade.php
@@ -8,29 +8,45 @@
         <span class="username-link font-weight-bold text-dark">{{$user->username}}</span>
       </div>
     </a>
-    <div class="float-right">
-      <div class="dropdown">
-        <button class="btn btn-link text-dark no-caret dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options">
+      <div class="float-right">
+        <div class="dropdown">
+          <button class="btn btn-link text-dark no-caret dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options">
           <span class="fas fa-ellipsis-v text-muted"></span>
-        </button>
-        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
-          <a class="dropdown-item font-weight-bold" href="{{$status->reportUrl()}}">Report</a>
-          {{-- <a class="dropdown-item" href="#">Embed</a> --}}
+          </button>
+          <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
+            <a class="dropdown-item font-weight-bold" href="{{$status->reportUrl()}}">Report</a>
+            {{-- <a class="dropdown-item" href="#">Embed</a> --}}
           @if(Auth::check())
-          @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true)
-          {{-- <a class="dropdown-item" href="{{$status->editUrl()}}">Edit</a> --}}
-          <form method="post" action="/i/delete">
+          @if(Auth::user()->profile->id !== $status->profile->id)
+          <div class="dropdown-divider"></div>
+          <form method="post" action="/i/mute">
             @csrf
-            <input type="hidden" name="type" value="post">
-            <input type="hidden" name="item" value="{{$status->id}}">
-            <button type="submit" class="dropdown-item btn btn-link font-weight-bold">Delete</button>
+            <input type="hidden" name="type" value="user">
+            <input type="hidden" name="item" value="{{$status->profile_id}}">
+            <button type="submit" class="dropdown-item btn btn-link font-weight-bold">Mute this user</button>
+          </form>
+          <form method="post" action="/i/block">
+            @csrf
+            <input type="hidden" name="type" value="user">
+            <input type="hidden" name="item" value="{{$status->profile_id}}">
+            <button type="submit" class="dropdown-item btn btn-link font-weight-bold">Block this user</button>
           </form>
           @endif
+            @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true)
+            <div class="dropdown-divider"></div>
+            {{-- <a class="dropdown-item" href="{{$status->editUrl()}}">Edit</a> --}}
+            <form method="post" action="/i/delete">
+              @csrf
+              <input type="hidden" name="type" value="post">
+              <input type="hidden" name="item" value="{{$status->id}}">
+              <button type="submit" class="dropdown-item btn btn-link font-weight-bold">Delete</button>
+            </form>
+            @endif
           @endif
 
+          </div>
         </div>
       </div>
-    </div>
   </div>
   <div class="d-flex flex-md-column flex-column-reverse h-100">
     <div class="card-body status-comments">

From 062ce4bac09a3e5fc54b248a59f49eff0e404356 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 2 Sep 2018 01:37:25 -0600
Subject: [PATCH 2/2] Update ProfileController

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

diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index f696c9590..336e596e8 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -29,7 +29,8 @@ class ProfileController extends Controller
         $username = $user->username;
         $loggedIn = Auth::check();
         $isPrivate = false;
-
+        $isBlocked = false;
+        
         if ($user->remote_url) {
             $settings = new \StdClass;
             $settings->crawlable = false;