s

packages/backend/src/core/AntennaService.ts

@@ -12,7 +12,7 @@ import { GlobalEventService } from '@/core/GlobalEventService.js';
 import * as Acct from '@/misc/acct.js';
 import type { Packed } from '@/misc/json-schema.js';
 import { DI } from '@/di-symbols.js';
-import type { AntennasRepository, UserListMembershipsRepository } from '@/models/_.js';
+import type { AntennasRepository, UserListMembershipsRepository, FollowingsRepository } from '@/models/_.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
 import type { GlobalEvents } from '@/core/GlobalEventService.js';
@@ -37,6 +37,9 @@ export class AntennaService implements OnApplicationShutdown {
 		@Inject(DI.userListMembershipsRepository)
 		private userListMembershipsRepository: UserListMembershipsRepository,
 
+		@Inject(DI.followingsRepository)
+		private followingsRepository: FollowingsRepository,
+
 		private utilityService: UtilityService,
 		private globalEventService: GlobalEventService,
 		private fanoutTimelineService: FanoutTimelineService,
@@ -111,8 +114,22 @@ export class AntennaService implements OnApplicationShutdown {
 
 	@bindThis
 	public async checkHitAntenna(antenna: MiAntenna, note: (MiNote | Packed<'Note'>), noteUser: { id: MiUser['id']; username: string; host: string | null; isBot: boolean; }): Promise<boolean> {
-		if (note.visibility === 'specified') return false;
-		if (note.visibility === 'followers') return false;
+		if (note.visibility === 'specified') {
+			if (note.userId !== antenna.userId) {
+				if (note.visibleUserIds == null) return false;
+				if (!note.visibleUserIds.includes(antenna.userId)) return false;
+			}
+		}
+		if (note.visibility === 'followers') {
+			const isFollowing = await this.followingsRepository.count({
+				where: {
+					followerId: antenna.userId,
+					followeeId: note.userId,
+				},
+				take: 1,
+			}).then(n => n > 0);
+			if (!isFollowing && antenna.userId !== note.userId) return false;
+		}
 
 		if (antenna.excludeBots && noteUser.isBot) return false;
 

packages/frontend/src/components/MkFollowButton.vue

@@ -6,25 +6,25 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <button
 	class="_button"
-	:class="[$style.root, { [$style.wait]: wait, [$style.active]: isFollowing || hasPendingFollowRequestFromYou, [$style.full]: full, [$style.large]: large }]"
+	:class="[$style.root, { [$style.wait]: wait, [$style.active]: userDetailed.isFollowing || userDetailed.hasPendingFollowRequestFromYou, [$style.full]: full, [$style.large]: large }]"
 	:disabled="wait"
 	@click="onClick"
 >
 	<template v-if="!wait">
-		<template v-if="hasPendingFollowRequestFromYou && user.isLocked">
+		<template v-if="userDetailed.hasPendingFollowRequestFromYou && userDetailed.isLocked">
 			<span v-if="full" :class="$style.text">{{ i18n.ts.followRequestPending }}</span><i class="ti ti-hourglass-empty"></i>
 		</template>
-		<template v-else-if="hasPendingFollowRequestFromYou && !user.isLocked">
+		<template v-else-if="userDetailed.hasPendingFollowRequestFromYou && !userDetailed.isLocked">
 			<!-- つまりリモートフォローの場合。 -->
 			<span v-if="full" :class="$style.text">{{ i18n.ts.processing }}</span><MkLoading :em="true" :colored="false"/>
 		</template>
-		<template v-else-if="isFollowing">
-			<span v-if="full" :class="$style.text">{{ i18n.ts.youFollowing }}</span><i class="ti ti-minus"></i>
+		<template v-else-if="userDetailed.isFollowing">
+			<span v-if="full" :class="$style.text">{{ i18n.ts.unfollow }}</span><i class="ti ti-minus"></i>
 		</template>
-		<template v-else-if="!isFollowing && user.isLocked">
+		<template v-else-if="!userDetailed.isFollowing && userDetailed.isLocked">
 			<span v-if="full" :class="$style.text">{{ i18n.ts.followRequest }}</span><i class="ti ti-plus"></i>
 		</template>
-		<template v-else-if="!isFollowing && !user.isLocked">
+		<template v-else-if="!userDetailed.isFollowing && !userDetailed.isLocked">
 			<span v-if="full" :class="$style.text">{{ i18n.ts.follow }}</span><i class="ti ti-plus"></i>
 		</template>
 	</template>
@@ -48,7 +48,7 @@ import { $i } from '@/account.js';
 import { defaultStore } from '@/store.js';
 
 const props = withDefaults(defineProps<{
-	user: Misskey.entities.UserDetailed,
+	user: { id: string } & Partial<Misskey.entities.UserDetailed>,
 	full?: boolean,
 	large?: boolean,
 }>(), {
@@ -56,26 +56,27 @@ const props = withDefaults(defineProps<{
 	large: false,
 });
 
-const emit = defineEmits<{
-	(_: 'update:user', value: Misskey.entities.UserDetailed): void
-}>();
+const emit = defineEmits<
+	(_: 'update:user', value: Misskey.entities.UserDetailed) => void
+>();
 
-const isFollowing = ref(props.user.isFollowing);
-const hasPendingFollowRequestFromYou = ref(props.user.hasPendingFollowRequestFromYou);
-const wait = ref(false);
+const userDetailed = ref<{ id: string } & Partial<Misskey.entities.UserDetailed>>(props.user);
+const wait = ref(props.user.isLocked === undefined);
 const connection = useStream().useChannel('main');
 
-if (props.user.isFollowing == null && $i) {
+if (userDetailed.value.isLocked === undefined) {
 	misskeyApi('users/show', {
 		userId: props.user.id,
 	})
-		.then(onFollowChange);
+		.then(onFollowChange)
+		.then(() => {
+			wait.value = false;
+		});
 }
 
 function onFollowChange(user: Misskey.entities.UserDetailed) {
 	if (user.id === props.user.id) {
-		isFollowing.value = user.isFollowing;
-		hasPendingFollowRequestFromYou.value = user.hasPendingFollowRequestFromYou;
+		userDetailed.value = user;
 	}
 }
 
@@ -85,10 +86,10 @@ async function onClick() {
 	wait.value = true;
 
 	try {
-		if (isFollowing.value) {
+		if (userDetailed.value.isFollowing) {
 			const { canceled } = await os.confirm({
 				type: 'warning',
-				text: i18n.tsx.unfollowConfirm({ name: props.user.name || props.user.username }),
+				text: i18n.tsx.unfollowConfirm({ name: (userDetailed.value.name || userDetailed.value.username) ?? i18n.ts.user }),
 			});
 
 			if (canceled) return;
@@ -109,24 +110,23 @@ async function onClick() {
 				}
 			}
 
-			if (hasPendingFollowRequestFromYou.value) {
+			if (userDetailed.value.hasPendingFollowRequestFromYou) {
 				await misskeyApi('following/requests/cancel', {
 					userId: props.user.id,
 				});
-				hasPendingFollowRequestFromYou.value = false;
+				userDetailed.value.hasPendingFollowRequestFromYou = false;
 			} else {
 				await misskeyApi('following/create', {
 					userId: props.user.id,
 					withReplies: defaultStore.state.defaultWithReplies,
 				});
 				emit('update:user', {
-					...props.user,
+					...userDetailed.value,
 					withReplies: defaultStore.state.defaultWithReplies,
 				});
-				hasPendingFollowRequestFromYou.value = true;
-
-				if ($i == null) return;
+				userDetailed.value.hasPendingFollowRequestFromYou = true;
 
+				if ($i) {
 					claimAchievement('following1');
 
 					if ($i.followingCount >= 10) {
@@ -143,6 +143,7 @@ async function onClick() {
 					}
 				}
 			}
+		}
 	} catch (err) {
 		console.error(err);
 	} finally {
@@ -192,14 +193,6 @@ onBeforeUnmount(() => {
 		outline-offset: 2px;
 	}
 
-	&:hover {
-		//background: mix($primary, #fff, 20);
-	}
-
-	&:active {
-		//background: mix($primary, #fff, 40);
-	}
-
 	&.active {
 		color: var(--fgOnAccent);
 		background: var(--accent);

packages/frontend/src/components/MkNotification.vue

@@ -113,6 +113,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkA>
 			<template v-else-if="notification.type === 'follow'">
 				<span :class="$style.text" style="opacity: 0.6;">{{ i18n.ts.youGotNewFollower }}</span>
+				<div v-if="full"><MkFollowButton :user="notification.user" :full="true"/></div>
 			</template>
 			<template v-else-if="notification.type === 'unfollow'">
 				<span :class="$style.text" style="opacity: 0.6;">{{ i18n.ts.youGotUnFollower }}</span>
@@ -171,6 +172,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import MkReactionIcon from '@/components/MkReactionIcon.vue';
+import MkFollowButton from '@/components/MkFollowButton.vue';
 import MkButton from '@/components/MkButton.vue';
 import { getNoteSummary } from '@/scripts/get-note-summary.js';
 import { notePage } from '@/filters/note.js';