eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[ENTITY][LocalUser] Make more use of caching and factor out the cache keys

Browse Source
This commit is contained in:
Hugo Sales 2021-12-12 16:21:09 +00:00
parent f6a8ee86b6
commit 10ddbf692a
Signed by untrusted user: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Entity/LocalUser.php
View File

@ -32,7 +32,6 @@ use App\Util\Exception\NicknameEmptyException;
use App\Util\Exception\NicknameException; use App\Util\Exception\NicknameException;
use App\Util\Exception\NicknameInvalidException; use App\Util\Exception\NicknameInvalidException;
use App\Util\Exception\NicknameNotAllowedException; use App\Util\Exception\NicknameNotAllowedException;
use App\Util\Exception\NicknameNotFoundException;
use App\Util\Exception\NicknameTakenException; use App\Util\Exception\NicknameTakenException;
use App\Util\Exception\NicknameTooLongException; use App\Util\Exception\NicknameTooLongException;
use App\Util\Nickname; use App\Util\Nickname;
@ -41,7 +40,6 @@ use Exception;
use libphonenumber\PhoneNumber; use libphonenumber\PhoneNumber;
use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface; use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Security\Core\User\UserInterface;
use function App\Core\I18n\_m;
/** /**
* Entity for users * Entity for users
@ -332,8 +330,6 @@ class LocalUser extends Entity implements UserInterface, PasswordAuthenticatedUs
* Returns the username used to authenticate the user. * Returns the username used to authenticate the user.
* Part of the Symfony UserInterface * Part of the Symfony UserInterface
* *
* @return string
*
* @deprecated since Symfony 5.3, use getUserIdentifier() instead * @deprecated since Symfony 5.3, use getUserIdentifier() instead
*/ */
public function getUsername(): string public function getUsername(): string
@ -344,7 +340,6 @@ class LocalUser extends Entity implements UserInterface, PasswordAuthenticatedUs
/** /**
* returns the identifier for this user (e.g. its nickname) * returns the identifier for this user (e.g. its nickname)
* Part of the Symfony UserInterface * Part of the Symfony UserInterface
* @return string
*/ */
public function getUserIdentifier(): string public function getUserIdentifier(): string
{ {
@ -356,18 +351,20 @@ class LocalUser extends Entity implements UserInterface, PasswordAuthenticatedUs
* Checks if desired nickname is allowed, and in case it is, it sets Actor's nickname cache to newly set nickname * 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 string $nickname Desired new nickname
* @param int $actor_id Used to cache Actor nickname * @param int $actor_id Used to cache Actor nickname
* @return $this *
* @throws NicknameEmptyException * @throws NicknameEmptyException
* @throws NicknameInvalidException * @throws NicknameInvalidException
* @throws NicknameNotAllowedException * @throws NicknameNotAllowedException
* @throws NicknameTakenException * @throws NicknameTakenException
* @throws NicknameTooLongException * @throws NicknameTooLongException
*
* @return $this
*/ */
public function setNicknameSanitizedAndCached(string $nickname, int $actor_id): self public function setNicknameSanitizedAndCached(string $nickname, int $actor_id): self
{ {
try { try {
$nickname = Nickname::normalize($nickname, check_already_used: false, which: Nickname::CHECK_LOCAL_USER, check_is_allowed: true); $nickname = Nickname::normalize($nickname, check_already_used: false, which: Nickname::CHECK_LOCAL_USER, check_is_allowed: true);
$this->nickname = $nickname; $this->nickname = $nickname;
Cache::set('actor-nickname-id-' . $actor_id, $nickname); Cache::set('actor-nickname-id-' . $actor_id, $nickname);
} catch (NicknameEmptyException $e) { } catch (NicknameEmptyException $e) {
@ -386,9 +383,9 @@ class LocalUser extends Entity implements UserInterface, PasswordAuthenticatedUs
return $this; return $this;
} }
public function getActor() public function getActor(): Actor
{ {
return DB::find('actor', ['id' => $this->id]); return Actor::getById($this->id);
} }
/** /**
@ -399,10 +396,24 @@ class LocalUser extends Entity implements UserInterface, PasswordAuthenticatedUs
return UserRoles::toArray($this->getActor()->getRoles()); return UserRoles::toArray($this->getActor()->getRoles());
} }
public static function cacheKeys(mixed $identifier): array
{
return [
'id' => "user-id-{$identifier}",
'nickname' => "user-nickname-{$identifier}",
'email' => "user-email-{$identifier}",
];
}
public static function getById(int $id): ?self
{
return Cache::get(self::cacheKeys($id)['id'], fn () => DB::findOneBy('local_user', ['id' => $id]));
}
public static function getByNickname(string $nickname): ?self public static function getByNickname(string $nickname): ?self
{ {
$key = str_replace('_', '-', $nickname); $key = str_replace('_', '-', $nickname);
return Cache::get("user-nickname-{$key}", fn () => DB::findOneBy('local_user', ['nickname' => $nickname])); return Cache::get(self::cacheKeys($key)['nickname'], fn () => DB::findOneBy('local_user', ['nickname' => $nickname]));
} }
/** /**
@ -411,7 +422,7 @@ class LocalUser extends Entity implements UserInterface, PasswordAuthenticatedUs
public static function getByEmail(string $email): ?self public static function getByEmail(string $email): ?self
{ {
$key = str_replace('@', '-', $email); $key = str_replace('@', '-', $email);
return Cache::get("user-email-{$key}", fn () => DB::findOneBy('local_user', ['or' => ['outgoing_email' => $email, 'incoming_email' => $email]])); return Cache::get(self::cacheKeys($key)['email'], fn () => DB::findOneBy('local_user', ['or' => ['outgoing_email' => $email, 'incoming_email' => $email]]));
} }
public static function schemaDef(): array public static function schemaDef(): array