From 14ba350ba3f1bab6364a103b38441482b0929fe2 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 16 Feb 2020 23:15:24 -0700 Subject: [PATCH] Fix postgres bugs --- app/Http/Controllers/Auth/RegisterController.php | 8 ++++++++ app/Http/Controllers/ProfileController.php | 4 ++++ app/Util/ActivityPub/Helpers.php | 10 +++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index fd0b2fa88..61634810f 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -53,6 +53,10 @@ class RegisterController extends Controller */ protected function validator(array $data) { + if(config('database.default') == 'pgsql') { + $data['username'] = strtolower($data['username']); + } + $this->validateUsername($data['username']); $this->validateEmail($data['email']); @@ -105,6 +109,10 @@ class RegisterController extends Controller */ protected function create(array $data) { + if(config('database.default') == 'pgsql') { + $data['username'] = strtolower($data['username']); + } + return User::create([ 'name' => $data['name'], 'username' => $data['username'], diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 20e4d08ec..e5f90693a 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -22,6 +22,10 @@ class ProfileController extends Controller { public function show(Request $request, $username) { + if(config('database.default') == 'pgsql') { + $username = strtolower($username); + } + $user = Profile::whereNull('domain') ->whereNull('status') ->whereUsername($username) diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index da74a1cb2..af46fee5e 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -412,14 +412,14 @@ class Helpers { $profile = Profile::whereRemoteUrl($res['id'])->first(); if(!$profile) { $profile = new Profile(); - $profile->domain = $domain; - $profile->username = (string) Purify::clean($remoteUsername); + $profile->domain = strtolower($domain); + $profile->username = strtolower(Purify::clean($remoteUsername)); $profile->name = isset($res['name']) ? Purify::clean($res['name']) : 'user'; $profile->bio = isset($res['summary']) ? Purify::clean($res['summary']) : null; $profile->sharedInbox = isset($res['endpoints']) && isset($res['endpoints']['sharedInbox']) ? $res['endpoints']['sharedInbox'] : null; - $profile->inbox_url = $res['inbox']; - $profile->outbox_url = $res['outbox']; - $profile->remote_url = $res['id']; + $profile->inbox_url = strtolower($res['inbox']); + $profile->outbox_url = strtolower($res['outbox']); + $profile->remote_url = strtolower($res['id']); $profile->public_key = $res['publicKey']['publicKeyPem']; $profile->key_id = $res['publicKey']['id']; $profile->save();