flashii/misuzu
flashii/misuzu
1
1
Fork 0
Code Issues Pull requests Releases 159 Wiki Activity Actions

Reordered output cus it was bothering me.

Browse source
This commit is contained in:
flash 2024-11-21 20:05:56 +00:00
parent 242e70eabf
commit 39be84fcc0
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/Users/UsersRpcHandler.php
View file

@ -53,36 +53,38 @@ final class UsersRpcHandler implements RpcHandler {
$avatars = array_reverse($avatars); $avatars = array_reverse($avatars);
$output = [ $output = [];
'id' => $userInfo->getId(),
'name' => $userInfo->getName(),
'colour_raw' => $colourRaw,
'colour_css' => $colourCSS,
'rank' => $rank,
'country_code' => $userInfo->getCountryCode(),
'avatar_urls' => $avatars,
'profile_url' => $baseUrl . $this->urls->format('user-profile', ['user' => $userInfo->getId()]),
'created_at' => $userInfo->getCreatedAt()->toIso8601ZuluString(),
];
$output['id'] = $userInfo->getId();
$output['name'] = $userInfo->getName();
if($includeEMailAddress) if($includeEMailAddress)
$output['email'] = $userInfo->getEMailAddress(); $output['email'] = $userInfo->getEMailAddress();
if($userInfo->hasLastActive()) $output['colour_raw'] = $colourRaw;
$output['last_active_at'] = $userInfo->getLastActiveAt()->toIso8601ZuluString(); $output['colour_css'] = $colourCSS;
$output['rank'] = $rank;
$output['country_code'] = $userInfo->getCountryCode();
$roles = XArray::select( $roles = XArray::select(
$this->usersCtx->getRoles()->getRoles(userInfo: $userInfo, hasString: true, orderByRank: true), $this->usersCtx->getRoles()->getRoles(userInfo: $userInfo, hasString: true, orderByRank: true),
fn($roleInfo) => $roleInfo->getString(), fn($roleInfo) => $roleInfo->getString(),
); );
if(!empty($roles)) if(!empty($roles))
$output['roles'] = $roles; $output['roles'] = $roles;
if($userInfo->isSuperUser())
$output['is_super'] = true;
if($userInfo->hasTitle()) if($userInfo->hasTitle())
$output['title'] = $userInfo->getTitle(); $output['title'] = $userInfo->getTitle();
if($userInfo->isSuperUser()) $output['created_at'] = $userInfo->getCreatedAt()->toIso8601ZuluString();
$output['is_super'] = true; if($userInfo->hasLastActive())
$output['last_active_at'] = $userInfo->getLastActiveAt()->toIso8601ZuluString();
$output['profile_url'] = $baseUrl . $this->urls->format('user-profile', ['user' => $userInfo->getId()]);
$output['avatar_urls'] = $avatars;
if($userInfo->isDeleted()) if($userInfo->isDeleted())
$output['is_deleted'] = true; $output['is_deleted'] = true;