YunoHost-Apps/pixelfed_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pixelfed_ynh.git synced 2024-09-03 20:06:04 +02:00
Code Issues Activity Actions

Fix postgres bugs

Browse source
This commit is contained in:
Daniel Supernault 2020-02-16 23:15:24 -07:00
parent c78bdadb8a
commit 14ba350ba3
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/Auth/RegisterController.php
View file

@ -53,6 +53,10 @@ class RegisterController extends Controller
*/ */
protected function validator(array $data) protected function validator(array $data)
{ {
if(config('database.default') == 'pgsql') {
$data['username'] = strtolower($data['username']);
}
$this->validateUsername($data['username']); $this->validateUsername($data['username']);
$this->validateEmail($data['email']); $this->validateEmail($data['email']);
@ -105,6 +109,10 @@ class RegisterController extends Controller
*/ */
protected function create(array $data) protected function create(array $data)
{ {
if(config('database.default') == 'pgsql') {
$data['username'] = strtolower($data['username']);
}
return User::create([ return User::create([
'name' => $data['name'], 'name' => $data['name'],
'username' => $data['username'], 'username' => $data['username'],

4
app/Http/Controllers/ProfileController.php
View file

@ -22,6 +22,10 @@ class ProfileController extends Controller
{ {
public function show(Request $request, $username) public function show(Request $request, $username)
{ {
if(config('database.default') == 'pgsql') {
$username = strtolower($username);
}
$user = Profile::whereNull('domain') $user = Profile::whereNull('domain')
->whereNull('status') ->whereNull('status')
->whereUsername($username) ->whereUsername($username)

10
app/Util/ActivityPub/Helpers.php
View file

@ -412,14 +412,14 @@ class Helpers {
$profile = Profile::whereRemoteUrl($res['id'])->first(); $profile = Profile::whereRemoteUrl($res['id'])->first();
if(!$profile) { if(!$profile) {
$profile = new Profile(); $profile = new Profile();
$profile->domain = $domain; $profile->domain = strtolower($domain);
$profile->username = (string) Purify::clean($remoteUsername); $profile->username = strtolower(Purify::clean($remoteUsername));
$profile->name = isset($res['name']) ? Purify::clean($res['name']) : 'user'; $profile->name = isset($res['name']) ? Purify::clean($res['name']) : 'user';
$profile->bio = isset($res['summary']) ? Purify::clean($res['summary']) : null; $profile->bio = isset($res['summary']) ? Purify::clean($res['summary']) : null;
$profile->sharedInbox = isset($res['endpoints']) && isset($res['endpoints']['sharedInbox']) ? $res['endpoints']['sharedInbox'] : null; $profile->sharedInbox = isset($res['endpoints']) && isset($res['endpoints']['sharedInbox']) ? $res['endpoints']['sharedInbox'] : null;
$profile->inbox_url = $res['inbox']; $profile->inbox_url = strtolower($res['inbox']);
$profile->outbox_url = $res['outbox']; $profile->outbox_url = strtolower($res['outbox']);
$profile->remote_url = $res['id']; $profile->remote_url = strtolower($res['id']);
$profile->public_key = $res['publicKey']['publicKeyPem']; $profile->public_key = $res['publicKey']['publicKeyPem'];
$profile->key_id = $res['publicKey']['id']; $profile->key_id = $res['publicKey']['id'];
$profile->save(); $profile->save();