diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2024-07-14 09:26:25 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-14 09:26:25 +0900 |
| commit | 58c596cacf8d2bd2572075051e4361500e791bdd (patch) | |
| tree | 0c6cd1c8d026b9aa80136a30caca9a5b0899fc66 /packages/backend/src | |
| parent | deps(frontend): AiScript VSCodeのバージョンを上げる (#14199) (diff) | |
| download | misskey-58c596cacf8d2bd2572075051e4361500e791bdd.tar.gz misskey-58c596cacf8d2bd2572075051e4361500e791bdd.tar.bz2 misskey-58c596cacf8d2bd2572075051e4361500e791bdd.zip | |
fix(backend): 一般ユーザーから見たユーザーのバッジの一覧に公開されていないものが含まれることがある問題を修正 (#14195)
* enhance(backend): 公開バッジのみをpackするように (MisskeyIO#652)
(cherry picked from commit b8a90659f35fef49d1d00fb2f9b152226c97643c)
* Update Changelog
* fix
* Update UserEntityService.ts
---------
Co-authored-by: CyberRex <26585194+CyberRex0@users.noreply.github.com>
Diffstat (limited to 'packages/backend/src')
| -rw-r--r-- | packages/backend/src/core/entities/UserEntityService.ts | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts index da96878713..7fd093c191 100644 --- a/packages/backend/src/core/entities/UserEntityService.ts +++ b/packages/backend/src/core/entities/UserEntityService.ts @@ -501,11 +501,15 @@ export class UserEntityService implements OnModuleInit { emojis: this.customEmojiService.populateEmojis(user.emojis, user.host), onlineStatus: this.getOnlineStatus(user), // パフォーマンス上の理由でローカルユーザーのみ - badgeRoles: user.host == null ? this.roleService.getUserBadgeRoles(user.id).then(rs => rs.sort((a, b) => b.displayOrder - a.displayOrder).map(r => ({ - name: r.name, - iconUrl: r.iconUrl, - displayOrder: r.displayOrder, - }))) : undefined, + badgeRoles: user.host == null ? this.roleService.getUserBadgeRoles(user.id).then((rs) => rs + .filter((r) => r.isPublic || iAmModerator) + .sort((a, b) => b.displayOrder - a.displayOrder) + .map((r) => ({ + name: r.name, + iconUrl: r.iconUrl, + displayOrder: r.displayOrder, + })) + ) : undefined, ...(isDetailed ? { url: profile!.url, |