From e3760749aec0a77e6c484e958314957944ef782b Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 12 Feb 2019 19:48:28 -0700
Subject: [PATCH] More postgres fixes

---
 .../Admin/AdminSettingsController.php         | 23 ++++++++++++++++++-
 .../Controllers/InternalApiController.php     |  1 -
 app/Http/Controllers/ProfileController.php    |  2 +-
 .../views/admin/settings/system.blade.php     |  4 ++--
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Admin/AdminSettingsController.php b/app/Http/Controllers/Admin/AdminSettingsController.php
index 708fa3121..a87499bc1 100644
--- a/app/Http/Controllers/Admin/AdminSettingsController.php
+++ b/app/Http/Controllers/Admin/AdminSettingsController.php
@@ -105,10 +105,31 @@ trait AdminSettingsController
   {
     $sys = [
       'pixelfed' => config('pixelfed.version'),
-      'mysql' => DB::select( DB::raw("select version()") )[0]->{'version()'},
       'php' => phpversion(),
       'redis' => explode(' ',exec('redis-cli -v'))[1],
     ];
+    switch (config('database.default')) {
+      case 'pgsql':
+        $sys['database'] = [
+          'name' => 'Postgres',
+          'version' => explode(' ', DB::select(DB::raw('select version();'))[0]->version)[1]
+        ];
+        break;
+
+      case 'mysql':
+        $sys['database'] = [
+          'name' => 'MySQL',
+          'version' => DB::select( DB::raw("select version()") )[0]->{'version()'}
+        ];
+        break;
+      
+      default:
+        $sys['database'] = [
+          'name' => 'Unknown',
+          'version' => '?'
+        ];
+        break;
+    }
     return view('admin.settings.system', compact('sys'));
   }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/InternalApiController.php b/app/Http/Controllers/InternalApiController.php
index 45738baa6..8e41f9f30 100644
--- a/app/Http/Controllers/InternalApiController.php
+++ b/app/Http/Controllers/InternalApiController.php
@@ -78,7 +78,6 @@ class InternalApiController extends Controller
         }
 
         $status->caption = strip_tags($request->caption);
-        $status->visibility = 'draft';
         $status->scope = 'draft';
         $status->profile_id = $profile->id;
         $status->save();
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 5440b7890..1b544ce7a 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -68,7 +68,7 @@ class ProfileController extends Controller
         } 
         $is_admin = is_null($user->domain) ? $user->user->is_admin : false;
         $profile = $user;
-        return view('profile.show', compact('user', 'profile', 'settings', 'owner', 'is_following', 'is_admin', 'timeline'));
+        return view('profile.show', compact('user', 'profile', 'settings', 'owner', 'is_following', 'is_admin'));
     }
 
     public function permalinkRedirect(Request $request, $username)
diff --git a/resources/views/admin/settings/system.blade.php b/resources/views/admin/settings/system.blade.php
index 5878e0b88..03c3669cd 100644
--- a/resources/views/admin/settings/system.blade.php
+++ b/resources/views/admin/settings/system.blade.php
@@ -21,9 +21,9 @@
     <div class="col-12 col-md-3">
       <div class="card mb-3 border-left-blue">
         <div class="card-body text-center">
-          <p class="font-weight-ultralight h2 mb-0 text-truncate">{{$sys['mysql']}}</p>
+          <p class="font-weight-ultralight h2 mb-0 text-truncate">{{$sys['database']['version']}}</p>
         </div>
-        <div class="card-footer font-weight-bold py-0 text-center bg-white">MySQL</div>
+        <div class="card-footer font-weight-bold py-0 text-center bg-white">{{$sys['database']['name']}}</div>
       </div>
     </div>
     <div class="col-12 col-md-3">