From 4501b7e85e0d34865bce4ba6f8b7d3b77164d875 Mon Sep 17 00:00:00 2001 From: Eliseu Amaro Date: Fri, 3 Dec 2021 02:51:41 +0000 Subject: [PATCH] [CONTROLLER][UserPanel] Re-organised all settings forms. Added email, password, language forms separated from account or personal account info [CORE][Form] Better PHPDoc and used is_null() for checks [ENTITY][LocalUser] Add setNicknameSanitisedAndCached [UTIL][Exception] Better NicknameNotAllowedException default message --- src/Controller/UserPanel.php | 383 +++++++++++------- src/Core/Form.php | 22 +- src/Entity/LocalUser.php | 43 ++ .../Exception/NicknameNotAllowedException.php | 2 +- templates/settings/base.html.twig | 20 +- 5 files changed, 315 insertions(+), 155 deletions(-) diff --git a/src/Controller/UserPanel.php b/src/Controller/UserPanel.php index 1f5fbb3d81..3f7900761e 100644 --- a/src/Controller/UserPanel.php +++ b/src/Controller/UserPanel.php @@ -1,6 +1,6 @@ account($request); - $personal_form = $this->personalInfo($request); + $personal_form = $this->personalInfo($request); + $email_form = $this->email($request); + $password_form = $this->password($request); + $language_form = $this->language($request); + $notifications_form_array = $this->notifications($request); return [ - '_template' => 'settings/base.html.twig', - 'profile' => $personal_form->createView(), - 'account' => $account_form->createView(), + '_template' => 'settings/base.html.twig', + 'profile' => $personal_form->createView(), + 'email' => $email_form->createView(), + 'password' => $password_form->createView(), + 'language' => $language_form->createView(), 'tabbed_forms_notify' => $notifications_form_array, - 'open_details_query' => $this->string('open'), + 'open_details_query' => $this->string('open'), ]; } /** - * Local user personal information panel + * Change email settings form + * + * @param Request $request + * @return FormInterface + * @throws NoLoggedInUser + * @throws ServerException */ - public function personalInfo(Request $request) - { - $user = Common::ensureLoggedIn(); - $actor = $user->getActor(); - [$_, $actor_tags] = $actor->getSelfTags(); - $extra = ['self_tags' => $actor_tags]; - $form_definition = [ - ['nickname', TextType::class, ['label' => _m('Nickname'), 'required' => true, 'help' => _m('1-64 lowercase letters or numbers, no punctuation or spaces.')]], - ['full_name', TextType::class, ['label' => _m('Full Name'), 'required' => false, 'help' => _m('A full name is required, if empty it will be set to your nickname.')]], - ['homepage', TextType::class, ['label' => _m('Homepage'), 'required' => false, 'help' => _m('URL of your homepage, blog, or profile on another site.')]], - ['bio', TextareaType::class, ['label' => _m('Bio'), 'required' => false, 'help' => _m('Describe yourself and your interests.')]], - ['location', TextType::class, ['label' => _m('Location'), 'required' => false, 'help' => _m('Where you are, like "City, State (or Region), Country".')]], - ['self_tags', TextType::class, ['label' => _m('Self Tags'), 'required' => false, 'help' => _m('Tags for yourself (letters, numbers, -, ., and _), comma- or space-separated.'), 'transformer' => ArrayTransformer::class]], - ['save_personal_info', SubmitType::class, ['label' => _m('Save personal info')]], - ]; - $extra_step = function ($data, $extra_args) use ($user) { - // TODO: this isn't ideal, when the user nick is set it should be normalized and the cache updated - $nickname = Nickname::normalize($data['nickname'], check_already_used: false, which: Nickname::CHECK_LOCAL_USER, check_is_allowed: true); - if ($nickname) { - $user->setNickname($nickname); - // Updating actor cache - Cache::set('actor-nickname-id-' . $user->getActor()->getId(), $nickname); - } - }; - return Form::handle($form_definition, $request, $actor, $extra, $extra_step, [['self_tags' => $extra['self_tags']]]); - } - - /** - * Local user account information panel - */ - public function account(Request $request) + public function email(Request $request): FormInterface { $user = Common::ensureLoggedIn(); // TODO Add support missing settings $form = Form::create([ - ['outgoing_email', TextType::class, ['label' => _m('Outgoing email'), 'required' => false, 'help' => _m('Change the email we use to contact you')]], - ['incoming_email', TextType::class, ['label' => _m('Incoming email'), 'required' => false, 'help' => _m('Change the email you use to contact us (for posting, for instance)')]], - ['old_password', PasswordType::class, ['label' => _m('Old password'), 'required' => false, 'help' => _m('Enter your old password for verification'), 'attr' => ['placeholder' => '********']]], - FormFields::repeated_password(['required' => false]), - FormFields::language($user->getActor(), context_actor: null, label: _m('Languages'), help: _m('The languages you understand, so you can see primarily content in those'), multiple: true, required: false, use_short_display: false), - ['phone_number', PhoneNumberType::class, ['label' => _m('Phone number'), 'required' => false, 'help' => _m('Your phone number'), 'data_class' => null]], - ['save_account_info', SubmitType::class, ['label' => _m('Save account info')]], + ['outgoing_email', TextType::class, ['label' => _m('Outgoing email'), 'required' => false, 'help' => _m('Change the email we use to contact you')]], + ['incoming_email', TextType::class, ['label' => _m('Incoming email'), 'required' => false, 'help' => _m('Change the email you use to contact us (for posting, for instance)')]], + ['save_email', SubmitType::class, ['label' => _m('Save email info')]], ]); $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { $data = $form->getData(); - if (!\is_null($data['old_password'])) { + foreach ($data as $key => $val) { + $method = 'set' . ucfirst(Formatting::snakeCaseToCamelCase($key)); + if (method_exists($user, $method)) { + $user->{$method}($val); + } + } + DB::flush(); + } + + return $form; + } + + /** + * Change password form + * + * @param Request $request + * @return FormInterface + * @throws AuthenticationException + * @throws NoLoggedInUser + * @throws ServerException + */ + public function password(Request $request): FormInterface + { + $user = Common::ensureLoggedIn(); + // TODO Add support missing settings + + $form = Form::create([ + ['old_password', PasswordType::class, ['label' => _m('Old password'), 'required' => true, 'help' => _m('Enter your old password for verification'), 'attr' => ['placeholder' => '********']]], + FormFields::repeated_password(['required' => true]), + ['save_password', SubmitType::class, ['label' => _m('Save new password')]], + ]); + + $form->handleRequest($request); + if ($form->isSubmitted() && $form->isValid()) { + $data = $form->getData(); + if (!is_null($data['old_password'])) { $data['password'] = $form->get('password')->getData(); if (!($user->changePassword($data['old_password'], $data['password']))) { throw new AuthenticationException(_m('The provided password is incorrect')); @@ -152,31 +170,6 @@ class UserPanel extends Controller } unset($data['old_password'], $data['password']); - $redirect_to_language_sorting = false; - if (!\is_null($data['languages'])) { - $selected_langs = DB::findBy('language', ['locale' => $data['languages']]); - $existing_langs = DB::dql( - 'select l from language l join actor_language al with l.id = al.language_id where al.actor_id = :actor_id', - ['actor_id' => $user->getId()], - ); - $new_langs = array_udiff($selected_langs, $existing_langs, fn ($l, $r) => $l->getId() <=> $r->getId()); - $removing_langs = array_udiff($existing_langs, $selected_langs, fn ($l, $r) => $l->getId() <=> $r->getId()); - foreach ($new_langs as $l) { - DB::persist(ActorLanguage::create(['actor_id' => $user->getId(), 'language_id' => $l->getId(), 'ordering' => 0])); - } - if (!empty($removing_langs)) { - $actor_langs_to_remove = DB::findBy('actor_language', ['actor_id' => $user->getId(), 'language_id' => F\map($removing_langs, fn ($l) => $l->getId())]); - foreach ($actor_langs_to_remove as $lang) { - DB::remove($lang); - } - } - Cache::delete(ActorLanguage::collectionCacheKey($user)); - DB::flush(); - ActorLanguage::normalizeOrdering($user); // In case the user doesn't submit the other page - unset($data['languages']); - $redirect_to_language_sorting = true; - } - foreach ($data as $key => $val) { $method = 'set' . ucfirst(Formatting::snakeCaseToCamelCase($key)); if (method_exists($user, $method)) { @@ -184,114 +177,156 @@ class UserPanel extends Controller } } DB::flush(); - - if ($redirect_to_language_sorting) { - throw new RedirectException('settings_sort_languages', ['_fragment' => null]); // TODO doesn't clear fragment - } } - return $form; } /** - * Controller for defining the ordering of a users's languages + * @throws RedirectException + * @throws ServerException + * @throws NoLoggedInUser */ - public function sortLanguages(Request $request) + public function language(Request $request): FormInterface { $user = Common::ensureLoggedIn(); + // TODO Add support missing settings - $langs = DB::dql('select l.locale, l.long_display, al.ordering from language l join actor_language al with l.id = al.language_id where al.actor_id = :id order by al.ordering ASC', ['id' => $user->getId()]); - - $form_entries = []; - foreach ($langs as $l) { - $form_entries[] = [$l['locale'], IntegerType::class, ['label' => _m($l['long_display']), 'data' => $l['ordering']]]; - } - - $form_entries[] = ['save_language_order', SubmitType::class, []]; - $form_entries[] = ['go_back', SubmitType::class, ['label' => _m('Return to settings page')]]; - $form = Form::create($form_entries); + $form = Form::create([ + FormFields::language($user->getActor(), context_actor: null, label: _m('Languages'), help: _m('The languages you understand, so you can see primarily content in those'), multiple: true, required: false, use_short_display: false), + ['save_languages', SubmitType::class, ['label' => _m('Proceed to order selected languages')]], + ]); $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { - /** @var SubmitButton $button */ - $button = $form->get('go_back'); - $go_back = $button->isClicked(); - $data = $form->getData(); - asort($data); // Sort by the order value - $data = array_keys($data); // This keeps the order and gives us a unique number for each - foreach ($data as $order => $locale) { - $lang = Language::getFromLocale($locale); - $actor_lang = DB::getReference('actor_language', ['actor_id' => $user->getId(), 'language_id' => $lang->getId()]); - $actor_lang->setOrdering($order + 1); - } - DB::flush(); - if (!$go_back) { - // Stay on same page, but force update and prevent resubmission - throw new RedirectException('settings_sort_languages'); - } else { - throw new RedirectException('settings', ['open' => 'account', '_fragment' => 'save_account_info_languages']); - } - } + $data = $form->getData(); - return [ - '_template' => 'settings/sort_languages.html.twig', - 'form' => $form->createView(), + if (!\is_null($data['languages'])) { + $selected_langs = DB::findBy('language', ['locale' => $data['languages']]); + $existing_langs = DB::dql( + 'select l from language l join actor_language al with l.id = al.language_id where al.actor_id = :actor_id', + ['actor_id' => $user->getId()], + ); + + $new_langs = array_udiff($selected_langs, $existing_langs, fn ($l, $r) => $l->getId() <=> $r->getId()); + $removing_langs = array_udiff($existing_langs, $selected_langs, fn ($l, $r) => $l->getId() <=> $r->getId()); + foreach ($new_langs as $l) { + DB::persist(ActorLanguage::create(['actor_id' => $user->getId(), 'language_id' => $l->getId(), 'ordering' => 0])); + } + + if (!empty($removing_langs)) { + $actor_langs_to_remove = DB::findBy('actor_language', ['actor_id' => $user->getId(), 'language_id' => F\map($removing_langs, fn ($l) => $l->getId())]); + foreach ($actor_langs_to_remove as $lang) { + DB::remove($lang); + } + } + + Cache::delete(ActorLanguage::collectionCacheKey($user)); + DB::flush(); + ActorLanguage::normalizeOrdering($user); // In case the user doesn't submit the other page + unset($data['languages']); + + throw new RedirectException('settings_sort_languages', ['_fragment' => null]); // TODO doesn't clear fragment + } + + } + return $form; + } + + /** + * Local user personal information panel + * + * @param Request $request + * @return mixed + * @throws NicknameEmptyException + * @throws NicknameInvalidException + * @throws NicknameNotAllowedException + * @throws NicknameTakenException + * @throws NicknameTooLongException + * @throws NoLoggedInUser + * @throws ServerException + */ + public function personalInfo(Request $request): mixed + { + // Ensure the user is logged in and retrieve Actor object for given user + $user = Common::ensureLoggedIn(); + $actor = $user->getActor(); + + // Used in Form::handle as an array $extra_args + [$_, $actor_tags] = $actor->getSelfTags(); + $extra = ['self_tags' => $actor_tags]; + + // Defining the various form fields + $form_definition = [ + ['nickname', TextType::class, ['label' => _m('Nickname'), 'required' => true, 'help' => _m('1-64 lowercase letters or numbers, no punctuation or spaces.')]], + ['full_name', TextType::class, ['label' => _m('Full Name'), 'required' => false, 'help' => _m('A full name is required, if empty it will be set to your nickname.')]], + ['homepage', TextType::class, ['label' => _m('Homepage'), 'required' => false, 'help' => _m('URL of your homepage, blog, or profile on another site.')]], + ['bio', TextareaType::class, ['label' => _m('Bio'), 'required' => false, 'help' => _m('Describe yourself and your interests.')]], + ['phone_number', PhoneNumberType::class, ['label' => _m('Phone number'), 'required' => false, 'help' => _m('Your phone number'), 'data_class' => null]], + ['location', TextType::class, ['label' => _m('Location'), 'required' => false, 'help' => _m('Where you are, like "City, State (or Region), Country".')]], + ['self_tags', TextType::class, ['label' => _m('Self Tags'), 'required' => false, 'help' => _m('Tags for yourself (letters, numbers, -, ., and _), comma- or space-separated.'), 'transformer' => ArrayTransformer::class]], + ['save_personal_info', SubmitType::class, ['label' => _m('Save personal info')]], ]; + + // Setting nickname normalised and setting actor cache + $extra_step = function ($data, $extra_args) use ($user, $actor) { + $user->setNicknameSanitizedAndCached($data['nickname'], $actor->getId()); + }; + return Form::handle($form_definition, $request, $actor, $extra, $extra_step, [['self_tags' => $extra['self_tags']]]); } /** * Local user notification settings tabbed panel */ - public function notifications(Request $request) + public function notifications(Request $request): array { - $user = Common::ensureLoggedIn(); - $schema = DB::getConnection()->getSchemaManager(); - $platform = $schema->getDatabasePlatform(); - $columns = Common::arrayRemoveKeys($schema->listTableColumns('user_notification_prefs'), ['user_id', 'transport', 'created', 'modified']); + $user = Common::ensureLoggedIn(); + $schema = DB::getConnection()->getSchemaManager(); + $platform = $schema->getDatabasePlatform(); + $columns = Common::arrayRemoveKeys($schema->listTableColumns('user_notification_prefs'), ['user_id', 'transport', 'created', 'modified']); $form_defs = ['placeholder' => []]; foreach ($columns as $name => $col) { - $type = $col->getType(); - $val = $type->convertToPHPValue($col->getDefault(), $platform); + $type = $col->getType(); + $val = $type->convertToPHPValue($col->getDefault(), $platform); $type_str = $type->getName(); - $label = str_replace('_', ' ', ucfirst($name)); + $label = str_replace('_', ' ', ucfirst($name)); $labels = [ 'target_actor_id' => 'Target Actors', - 'dm' => 'DM', + 'dm' => 'DM', ]; $help = [ - 'target_actor_id' => 'If specified, these settings apply only to these profiles (comma- or space-separated list)', + 'target_actor_id' => 'If specified, these settings apply only to these profiles (comma- or space-separated list)', 'activity_by_subscribed' => 'Notify me when someone I subscribed has new activity', - 'mention' => 'Notify me when mentions me in a notice', - 'reply' => 'Notify me when someone replies to a notice made by me', - 'subscription' => 'Notify me when someone subscribes to me or asks for permission to do so', - 'favorite' => 'Notify me when someone favorites one of my notices', - 'nudge' => 'Notify me when someone nudges me', - 'dm' => 'Notify me when someone sends me a direct message', - 'post_on_status_change' => 'Post a notice when my status in this service changes', - 'enable_posting' => 'Enable posting from this service', + 'mention' => 'Notify me when mentions me in a notice', + 'reply' => 'Notify me when someone replies to a notice made by me', + 'subscription' => 'Notify me when someone subscribes to me or asks for permission to do so', + 'favorite' => 'Notify me when someone favorites one of my notices', + 'nudge' => 'Notify me when someone nudges me', + 'dm' => 'Notify me when someone sends me a direct message', + 'post_on_status_change' => 'Post a notice when my status in this service changes', + 'enable_posting' => 'Enable posting from this service', ]; switch ($type_str) { - case Types::BOOLEAN: - $form_defs['placeholder'][$name] = [$name, CheckboxType::class, ['data' => $val, 'required' => false, 'label' => _m($labels[$name] ?? $label), 'help' => _m($help[$name])]]; - break; - case Types::INTEGER: - if ($name == 'target_actor_id') { - $form_defs['placeholder'][$name] = [$name, TextType::class, ['data' => $val, 'required' => false, 'label' => _m($labels[$name]), 'help' => _m($help[$name])], 'transformer' => ActorArrayTransformer::class]; - } - break; - default: - // @codeCoverageIgnoreStart - Log::critical("Structure of table user_notification_prefs changed in a way not accounted to in notification settings ({$name}): " . $type_str); - throw new ServerException(_m('Internal server error')); + case Types::BOOLEAN: + $form_defs['placeholder'][$name] = [$name, CheckboxType::class, ['data' => $val, 'required' => false, 'label' => _m($labels[$name] ?? $label), 'help' => _m($help[$name])]]; + break; + case Types::INTEGER: + if ($name == 'target_actor_id') { + $form_defs['placeholder'][$name] = [$name, TextType::class, ['data' => $val, 'required' => false, 'label' => _m($labels[$name]), 'help' => _m($help[$name])], 'transformer' => ActorArrayTransformer::class]; + } + break; + default: + // @codeCoverageIgnoreStart + Log::critical("Structure of table user_notification_prefs changed in a way not accounted to in notification settings ({$name}): " . $type_str); + throw new ServerException(_m('Internal server error')); // @codeCoverageIgnoreEnd } } - $form_defs['placeholder']['save'] = fn (string $transport, string $form_name) => [$form_name, SubmitType::class, - ['label' => _m('Save notification settings for {transport}', ['transport' => $transport])], ]; + $form_defs['placeholder']['save'] = fn(string $transport, string $form_name) => [$form_name, SubmitType::class, + ['label' => _m('Save notification settings for {transport}', ['transport' => $transport])],]; Event::handle('AddNotificationTransport', [&$form_defs]); unset($form_defs['placeholder']); @@ -299,7 +334,7 @@ class UserPanel extends Controller $tabbed_forms = []; foreach ($form_defs as $transport_name => $f) { unset($f['save']); - $form = Form::create($f); + $form = Form::create($f); $tabbed_forms[$transport_name] = $form; $form->handleRequest($request); @@ -325,7 +360,59 @@ class UserPanel extends Controller } } - $tabbed_forms = F\map($tabbed_forms, fn ($f) => $f->createView()); + $tabbed_forms = F\map($tabbed_forms, fn($f) => $f->createView()); return $tabbed_forms; } + + /** + * Controller for defining the ordering of a users' languages + * + * @param Request $request + * @return array + * @throws NoLoggedInUser + * @throws RedirectException + * @throws ServerException + */ + public function sortLanguages(Request $request): array + { + $user = Common::ensureLoggedIn(); + + $langs = DB::dql('select l.locale, l.long_display, al.ordering from language l join actor_language al with l.id = al.language_id where al.actor_id = :id order by al.ordering ASC', ['id' => $user->getId()]); + + $form_entries = []; + foreach ($langs as $l) { + $form_entries[] = [$l['locale'], IntegerType::class, ['label' => _m($l['long_display']), 'data' => $l['ordering']]]; + } + + $form_entries[] = ['save_language_order', SubmitType::class, []]; + $form_entries[] = ['go_back', SubmitType::class, ['label' => _m('Return to settings page')]]; + $form = Form::create($form_entries); + + $form->handleRequest($request); + if ($form->isSubmitted() && $form->isValid()) { + /** @var SubmitButton $button */ + $button = $form->get('go_back'); + $go_back = $button->isClicked(); + $data = $form->getData(); + asort($data); // Sort by the order value + $data = array_keys($data); // This keeps the order and gives us a unique number for each + foreach ($data as $order => $locale) { + $lang = Language::getFromLocale($locale); + $actor_lang = DB::getReference('actor_language', ['actor_id' => $user->getId(), 'language_id' => $lang->getId()]); + $actor_lang->setOrdering($order + 1); + } + DB::flush(); + if (!$go_back) { + // Stay on same page, but force update and prevent resubmission + throw new RedirectException('settings_sort_languages'); + } else { + throw new RedirectException('settings', ['open' => 'account', '_fragment' => 'save_account_info_languages']); + } + } + + return [ + '_template' => 'settings/sort_languages.html.twig', + 'form' => $form->createView(), + ]; + } } diff --git a/src/Core/Form.php b/src/Core/Form.php index 0552da8535..fac150aa56 100644 --- a/src/Core/Form.php +++ b/src/Core/Form.php @@ -134,20 +134,33 @@ abstract class Form return $form[$field][2]['required'] ?? true; } + /** * Handle the full life cycle of a form. Creates it with @see * self::create and inserts the submitted values into the database + * + * @param array $form_definition + * @param Request $request + * @param object|null $target + * @param array $extra_args + * @param callable|null $extra_step + * @param array $create_args + * @param SymfForm|null $testing_only_form + * @return mixed + * @throws ServerException */ - public static function handle(array $form_definition, Request $request, ?object $target, array $extra_args = [], ?callable $extra_step = null, array $create_args = [], ?SymfForm $testing_only_form = null) + public static function handle(array $form_definition, Request $request, ?object $target, array $extra_args = [], ?callable $extra_step = null, array $create_args = [], ?SymfForm $testing_only_form = null): mixed { $form = $testing_only_form ?? self::create($form_definition, $target, ...$create_args); $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { + $data = $form->getData(); - if ($target == null) { + if (is_null($target)) { return $data; } + unset($data['translation_domain'], $data['save']); foreach ($data as $key => $val) { $method = 'set' . ucfirst(Formatting::snakeCaseToCamelCase($key)); @@ -155,19 +168,22 @@ abstract class Form if (isset($extra_args[$key])) { // @codeCoverageIgnoreStart $target->{$method}($val, $extra_args[$key]); - // @codeCoverageIgnoreEnd + // @codeCoverageIgnoreEnd } else { $target->{$method}($val); } } } + if (isset($extra_step)) { // @codeCoverageIgnoreStart $extra_step($data, $extra_args); // @codeCoverageIgnoreEnd } + DB::flush(); } + return $form; } } diff --git a/src/Entity/LocalUser.php b/src/Entity/LocalUser.php index 79271f87a5..d2d257a3a3 100644 --- a/src/Entity/LocalUser.php +++ b/src/Entity/LocalUser.php @@ -28,11 +28,20 @@ use App\Core\DB\DB; use App\Core\Entity; use App\Core\UserRoles; use App\Util\Common; +use App\Util\Exception\NicknameEmptyException; +use App\Util\Exception\NicknameException; +use App\Util\Exception\NicknameInvalidException; +use App\Util\Exception\NicknameNotAllowedException; +use App\Util\Exception\NicknameNotFoundException; +use App\Util\Exception\NicknameTakenException; +use App\Util\Exception\NicknameTooLongException; +use App\Util\Nickname; use DateTimeInterface; use Exception; use libphonenumber\PhoneNumber; use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface; use Symfony\Component\Security\Core\User\UserInterface; +use function App\Core\I18n\_m; /** * Entity for users @@ -343,6 +352,40 @@ class LocalUser extends Entity implements UserInterface, PasswordAuthenticatedUs } // }}} Authentication + /** + * Checks if desired nickname is allowed, and in case it is, it sets Actor's nickname cache to newly set nickname + * + * @param string $nickname Desired new nickname + * @param int $actor_id Used to cache Actor nickname + * @return $this + * @throws NicknameEmptyException + * @throws NicknameInvalidException + * @throws NicknameNotAllowedException + * @throws NicknameTakenException + * @throws NicknameTooLongException + */ + public function setNicknameSanitizedAndCached(string $nickname, int $actor_id): self + { + try { + $nickname = Nickname::normalize($nickname, check_already_used: false, which: Nickname::CHECK_LOCAL_USER, check_is_allowed: true); + $this->nickname = $nickname; + Cache::set('actor-nickname-id-' . $actor_id, $nickname); + } catch (NicknameEmptyException $e) { + throw new NicknameEmptyException(); + } catch (NicknameInvalidException $e) { + throw new NicknameInvalidException(); + } catch (NicknameNotAllowedException $e) { + throw new NicknameNotAllowedException(); + } catch (NicknameTakenException $e) { + throw new NicknameTakenException(); + } catch (NicknameTooLongException $e) { + throw new NicknameTooLongException(); + } catch (NicknameException $e) { + } + + return $this; + } + public function getActor() { return DB::find('actor', ['id' => $this->id]); diff --git a/src/Util/Exception/NicknameNotAllowedException.php b/src/Util/Exception/NicknameNotAllowedException.php index 98ffac8da3..9b371f56e2 100644 --- a/src/Util/Exception/NicknameNotAllowedException.php +++ b/src/Util/Exception/NicknameNotAllowedException.php @@ -48,6 +48,6 @@ class NicknameNotAllowedException extends NicknameException protected function defaultMessage(): string { // TRANS: Validation error in form for registration, profile and group settings, etc. - return _m('This nickname is not allowed.'); + return _m('Nickname not allowed! Only alphanumeric characters allowed.'); } } diff --git a/templates/settings/base.html.twig b/templates/settings/base.html.twig index 53b1bec5ce..5fcbf48874 100644 --- a/templates/settings/base.html.twig +++ b/templates/settings/base.html.twig @@ -65,9 +65,17 @@ - {% elseif title == 'Account' %} + {% elseif title == 'Email' %}
  • - {{ form(context.account) }} + {{ form(context.email) }} +
    • + {% elseif title == 'Password' %} +
  • + {{ form(context.password) }} +
    • + {% elseif title == 'Language' %} +
  • + {{ form(context.language) }}
    • {% elseif title == 'Notifications' %}
  • @@ -105,7 +113,13 @@
  • - {{ _self.settings_details_container('Account', 'Email, Password and Language', ['account'], _context) }} + {{ _self.settings_details_container('Email', 'Set incoming and outgoing email settings', ['email'], _context) }} +
    • +
  • + {{ _self.settings_details_container('Password', 'Change current password', ['password'], _context) }} +
    • +
  • + {{ _self.settings_details_container('Language', 'Select and set language preferences', ['language'], _context) }}