Update navbar-for-mobile.vue

packages/backend/src/core/entities/UserEntityService.ts

@@ -471,7 +471,7 @@ export class UserEntityService implements OnModuleInit {
 				hasUnreadChannel: false, // 後方互換性のため
 				hasUnreadNotification: notificationsInfo?.hasUnread, // 後方互換性のため
 				hasPendingReceivedFollowRequest: this.getHasPendingReceivedFollowRequest(user.id),
-				unreadNotificationCount: notificationsInfo?.unreadCount,
+				unreadNotificationsCount: notificationsInfo?.unreadCount,
 				mutedWords: profile!.mutedWords,
 				mutedInstances: profile!.mutedInstances,
 				mutingNotificationTypes: [], // 後方互換性のため

packages/backend/src/models/json-schema/user.ts

@@ -399,7 +399,7 @@ export const packedMeDetailedOnlySchema = {
 			type: 'boolean',
 			nullable: false, optional: false,
 		},
-		unreadNotificationCount: {
+		unreadNotificationsCount: {
 			type: 'number',
 			nullable: false, optional: false,
 		},

packages/backend/test/e2e/users.ts

@@ -164,7 +164,7 @@ describe('ユーザー', () => {
 			hasUnreadAntenna: user.hasUnreadAntenna,
 			hasUnreadChannel: user.hasUnreadChannel,
 			hasUnreadNotification: user.hasUnreadNotification,
-			unreadNotificationCount: user.unreadNotificationCount,
+			unreadNotificationsCount: user.unreadNotificationsCount,
 			hasPendingReceivedFollowRequest: user.hasPendingReceivedFollowRequest,
 			unreadAnnouncements: user.unreadAnnouncements,
 			mutedWords: user.mutedWords,
@@ -415,7 +415,7 @@ describe('ユーザー', () => {
 		assert.strictEqual(response.hasUnreadAntenna, false);
 		assert.strictEqual(response.hasUnreadChannel, false);
 		assert.strictEqual(response.hasUnreadNotification, false);
-		assert.strictEqual(response.unreadNotificationCount, 0);
+		assert.strictEqual(response.unreadNotificationsCount, 0);
 		assert.strictEqual(response.hasPendingReceivedFollowRequest, false);
 		assert.deepStrictEqual(response.unreadAnnouncements, []);
 		assert.deepStrictEqual(response.mutedWords, []);

packages/frontend/src/boot/main-boot.ts

@@ -228,15 +228,15 @@ export async function mainBoot() {
 		main.on('readAllNotifications', () => {
 			updateAccount({
 				hasUnreadNotification: false,
-				unreadNotificationCount: 0,
+				unreadNotificationsCount: 0,
 			});
 		});
 
 		main.on('unreadNotification', () => {
-			const unreadNotificationCount = ($i?.unreadNotificationCount ?? 0) + 1;
+			const unreadNotificationsCount = ($i?.unreadNotificationsCount ?? 0) + 1;
 			updateAccount({
 				hasUnreadNotification: true,
-				unreadNotificationCount,
+				unreadNotificationsCount,
 			});
 		});
 

packages/frontend/src/navbar.ts

@@ -20,12 +20,12 @@ export const navbarItemDef = reactive({
 		show: computed(() => $i != null),
 		indicated: computed(() => $i != null && $i.hasUnreadNotification),
 		indicateValue: computed(() => {
-			if (!$i || $i.unreadNotificationCount === 0) return '';
+			if (!$i || $i.unreadNotificationsCount === 0) return '';
 
-			if ($i.unreadNotificationCount > 99) {
+			if ($i.unreadNotificationsCount > 99) {
 				return '99+';
 			} else {
-				return $i.unreadNotificationCount.toString();
+				return $i.unreadNotificationsCount.toString();
 			}
 		}),
 		to: '/my/notifications',

packages/frontend/src/ui/_common_/navbar-for-mobile.vue

@@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<component :is="navbarItemDef[item].to ? 'MkA' : 'button'" v-else-if="navbarItemDef[item] && (navbarItemDef[item].show !== false)" class="_button" :class="[$style.item, { [$style.active]: navbarItemDef[item].active }]" :activeClass="$style.active" :to="navbarItemDef[item].to" v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}">
 				<i class="ti-fw" :class="[$style.itemIcon, navbarItemDef[item].icon]"></i><span :class="$style.itemText">{{ navbarItemDef[item].title }}</span>
 				<span v-if="navbarItemDef[item].indicated" :class="$style.itemIndicator">
-					<span v-if="navbarItemDef[item].indicateValue" :class="$style.itemIndicateValueIcon"><span>{{ navbarItemDef[item].indicateValue }}</span></span>
+					<span v-if="navbarItemDef[item].indicateValue" class="_indicateCounter" :class="$style.itemIndicateValueIcon">{{ navbarItemDef[item].indicateValue }}</span>
 					<i v-else class="_indicatorCircle"></i>
 				</span>
 			</component>
@@ -263,24 +263,6 @@ function more() {
 	}
 }
 
-.itemIndicateValueIcon {
-	display: inline-flex;
-	color: var(--fgOnAccent);
-	font-weight: 700;
-	background: var(--navIndicator);
-	height: 1.5em;
-	min-width: 1.5em;
-	align-items: center;
-	justify-content: center;
-	border-radius: 99rem;
-
-	& > span {
-		display: inline-block;
-		padding: 0 .25em;
-		line-height: 1.5em;
-	}
-}
-
 .itemText {
 	position: relative;
 	font-size: 0.9em;

packages/frontend/src/ui/deck.vue

@@ -55,7 +55,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<button :class="$style.navButton" class="_button" @click="mainRouter.push('/my/notifications')">
 			<i :class="$style.navButtonIcon" class="ti ti-bell"></i>
 			<span v-if="$i?.hasUnreadNotification" :class="$style.navButtonIndicator">
-				<span class="_indicateCounter" :class="$style.itemIndicateValueIcon">{{ $i.unreadNotificationCount > 99 ? '99+' : $i.unreadNotificationCount }}</span>
+				<span class="_indicateCounter" :class="$style.itemIndicateValueIcon">{{ $i.unreadNotificationsCount > 99 ? '99+' : $i.unreadNotificationsCount }}</span>
 			</span>
 		</button>
 		<button :class="$style.postButton" class="_button" @click="os.post()"><i :class="$style.navButtonIcon" class="ti ti-pencil"></i></button>

packages/frontend/src/ui/universal.vue

@@ -30,7 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<button :class="$style.navButton" class="_button" @click="mainRouter.push('/my/notifications')">
 			<i :class="$style.navButtonIcon" class="ti ti-bell"></i>
 			<span v-if="$i?.hasUnreadNotification" :class="$style.navButtonIndicator">
-				<span class="_indicateCounter" :class="$style.itemIndicateValueIcon">{{ $i.unreadNotificationCount > 99 ? '99+' : $i.unreadNotificationCount }}</span>
+				<span class="_indicateCounter" :class="$style.itemIndicateValueIcon">{{ $i.unreadNotificationsCount > 99 ? '99+' : $i.unreadNotificationsCount }}</span>
 			</span>
 		</button>
 		<button :class="$style.navButton" class="_button" @click="widgetsShowing = true"><i :class="$style.navButtonIcon" class="ti ti-apps"></i></button>

packages/misskey-js/etc/misskey-js.api.md

@@ -2488,7 +2488,7 @@ type MeDetailed = UserDetailed & {
     hasUnreadMessagingMessage: boolean;
     hasUnreadNotification: boolean;
     hasUnreadSpecifiedNotes: boolean;
-    unreadNotificationCount: number;
+    unreadNotificationsCount: number;
     hideOnlineStatus: boolean;
     injectFeaturedNote: boolean;
     integrations: Record<string, any>;

packages/misskey-js/src/entities.ts

@@ -106,7 +106,7 @@ export type MeDetailed = UserDetailed & {
 	hasUnreadMessagingMessage: boolean;
 	hasUnreadNotification: boolean;
 	hasUnreadSpecifiedNotes: boolean;
-	unreadNotificationCount: number;
+	unreadNotificationsCount: number;
 	hideOnlineStatus: boolean;
 	injectFeaturedNote: boolean;
 	integrations: Record<string, any>;