From 228d55c389cf56357178ba2826861aaea65fd5fa Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 13 Oct 2021 18:39:51 +0200 Subject: [PATCH 1/2] If discord is connected, use discord avatar instead of gravatar --- app/Models/User.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Models/User.php b/app/Models/User.php index d7c072da..b6ed0c77 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -213,7 +213,12 @@ class User extends Authenticatable implements MustVerifyEmail */ public function getAvatar() { - return "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email))); + if ($this->discordUser()->exists()){ + $avatar = $this->discordUser->getAvatar(); + }else{ + $avatar = "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email))); + } + return $avatar; } /** From 6325cd8f871bf097edb2170592084acc8f587580 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 13 Oct 2021 18:47:45 +0200 Subject: [PATCH 2/2] Beautify as AVMG wishes spacespacespaceenter --- app/Models/User.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index b6ed0c77..66bfa9be 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -213,11 +213,12 @@ class User extends Authenticatable implements MustVerifyEmail */ public function getAvatar() { - if ($this->discordUser()->exists()){ + if ($this->discordUser()->exists()) { $avatar = $this->discordUser->getAvatar(); - }else{ + } else { $avatar = "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email))); } + return $avatar; }