From 090a0878323ef8d056ba05c2fa09f6c4249e309d Mon Sep 17 00:00:00 2001
From: Diogo Peralta Cordeiro <mail@diogo.site>
Date: Mon, 14 Feb 2022 01:21:40 +0000
Subject: [PATCH] [COMPONENT][Group] Check nickname on register

---
 components/Group/Controller/Group.php | 8 +++++++-
 src/Controller/Security.php           | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/Group/Controller/Group.php b/components/Group/Controller/Group.php
index 179a694c51..3a88f6b99b 100644
--- a/components/Group/Controller/Group.php
+++ b/components/Group/Controller/Group.php
@@ -27,6 +27,7 @@ use App\Core\ActorLocalRoles;
 use App\Core\Cache;
 use App\Core\DB\DB;
 use App\Core\Form;
+use App\Util\Nickname;
 use function App\Core\I18n\_m;
 use App\Core\Log;
 use App\Core\Router\Router;
@@ -213,7 +214,12 @@ class Group extends FeedController
         $create_form->handleRequest($request);
         if ($create_form->isSubmitted() && $create_form->isValid()) {
             $data     = $create_form->getData();
-            $nickname = $data['group_nickname'];
+            $nickname = Nickname::normalize(
+                nickname: $data['group_nickname'],
+                check_already_used: true,
+                which: Nickname::CHECK_LOCAL_GROUP,
+                check_is_allowed: true
+            );
 
             Log::info(
                 _m(
diff --git a/src/Controller/Security.php b/src/Controller/Security.php
index 80f023d584..2b4866f7f0 100644
--- a/src/Controller/Security.php
+++ b/src/Controller/Security.php
@@ -133,7 +133,7 @@ class Security extends Controller
             $data['password'] = $form->get('password')->getData();
 
             // Already used is checked below
-            $nickname = Nickname::normalize($data['nickname'], check_already_used: false, which: Nickname::CHECK_LOCAL_USER, check_is_allowed: false);
+            $nickname = Nickname::normalize($data['nickname'], check_already_used: false, which: Nickname::CHECK_LOCAL_USER, check_is_allowed: true);
 
             try {
                 $found_user = DB::findOneBy('local_user', ['or' => ['nickname' => $nickname, 'outgoing_email' => $data['email']]]);