diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-08-28 11:30:03 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-08-28 11:30:03 +0900 |
| commit | ff6f1159767808b78cc8cda45d5097e387aecece (patch) | |
| tree | 3c89c4b6bb8b659ac0e47312c997d79a23361c6f | |
| parent | lint (diff) | |
| download | misskey-ff6f1159767808b78cc8cda45d5097e387aecece.tar.gz misskey-ff6f1159767808b78cc8cda45d5097e387aecece.tar.bz2 misskey-ff6f1159767808b78cc8cda45d5097e387aecece.zip | |
refactor
| -rw-r--r-- | packages/backend/src/core/entities/UserEntityService.ts | 4 | ||||
| -rw-r--r-- | packages/backend/src/models/json-schema/user.ts | 4 | ||||
| -rw-r--r-- | packages/frontend/src/pages/user/index.activity.vue | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts index 6abf205a56..4237de7170 100644 --- a/packages/backend/src/core/entities/UserEntityService.ts +++ b/packages/backend/src/core/entities/UserEntityService.ts @@ -471,8 +471,8 @@ export class UserEntityService implements OnModuleInit { (profile.followersVisibility === 'followers') && (relation && relation.isFollowing) ? user.followersCount : null; - const isModerator = isMe && isDetailed ? this.roleService.isModerator(user) : null; - const isAdmin = isMe && isDetailed ? this.roleService.isAdministrator(user) : null; + const isModerator = isMe && isDetailed ? this.roleService.isModerator(user) : false; // この場合undefinedにしたい(レスポンスに含める必要がないため)が、念のため後方互換性を確保 + const isAdmin = isMe && isDetailed ? this.roleService.isAdministrator(user) : false; // この場合undefinedにしたい(レスポンスに含める必要がないため)が、念のため後方互換性を確保 const unreadAnnouncements = isMe && isDetailed ? (await this.announcementService.getUnreadAnnouncements(user)).map((announcement) => ({ createdAt: this.idService.parse(announcement.id).date.toISOString(), diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts index dfefcd96f2..d4b22cc403 100644 --- a/packages/backend/src/models/json-schema/user.ts +++ b/packages/backend/src/models/json-schema/user.ts @@ -465,11 +465,11 @@ export const packedMeDetailedOnlySchema = { }, isModerator: { type: 'boolean', - nullable: true, optional: false, + nullable: false, optional: false, // optionalにしたいが念のため後方互換性を確保 }, isAdmin: { type: 'boolean', - nullable: true, optional: false, + nullable: false, optional: false, // optionalにしたいが念のため後方互換性を確保 }, injectFeaturedNote: { type: 'boolean', diff --git a/packages/frontend/src/pages/user/index.activity.vue b/packages/frontend/src/pages/user/index.activity.vue index 45bc35067b..210021618e 100644 --- a/packages/frontend/src/pages/user/index.activity.vue +++ b/packages/frontend/src/pages/user/index.activity.vue @@ -34,7 +34,7 @@ const props = withDefaults(defineProps<{ limit: 50, }); -const chartSrc = ref('per-user-notes'); +const chartSrc = ref<'per-user-notes' | 'per-user-pv'>('per-user-notes'); function showMenu(ev: MouseEvent) { os.popupMenu([{ |