Fix: 相手からのフォローを隠す設定を有効にしているとき、新UIで相手からのフォロー状況が表示されていた問題 (#1047)

* Fix: 相手からのフォローを隠す設定を有効にしているとき、新UIで相手からのフォロー状況が表示されていた問題

* Fix lint

* Add Japanese translation

Author: kmycode

app/javascript/mastodon/components/hover_card_account.tsx

@@ -19,7 +19,7 @@ import { FollowButton } from 'mastodon/components/follow_button';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { ShortNumber } from 'mastodon/components/short_number';
 import { useFetchFamiliarFollowers } from 'mastodon/features/account_timeline/hooks/familiar_followers';
-import { domain } from 'mastodon/initial_state';
+import { domain, isHideItem } from 'mastodon/initial_state';
 import { getAccountHidden } from 'mastodon/selectors/accounts';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
@@ -54,8 +54,10 @@ export const HoverCardAccount = forwardRef<
   const relationship = useAppSelector((state) =>
     accountId ? state.relationships.get(accountId) : undefined,
   );
-  const isMutual = relationship?.followed_by && relationship.following;
-  const isFollower = relationship?.followed_by;
+  const isHideRelationships = isHideItem('relationships');
+  const isMutual =
+    !isHideRelationships && relationship?.followed_by && relationship.following;
+  const isFollower = !isHideRelationships && relationship?.followed_by;
   const hasRelationshipLoaded = !!relationship;
 
   const shouldDisplayFamiliarFollowers =

app/javascript/mastodon/features/account_timeline/components/account_header.tsx

@@ -51,7 +51,12 @@ import { DomainPill } from 'mastodon/features/account/components/domain_pill';
 import FollowRequestNoteContainer from 'mastodon/features/account/containers/follow_request_note_container';
 import { useLinks } from 'mastodon/hooks/useLinks';
 import { useIdentity } from 'mastodon/identity_context';
-import { autoPlayGif, me, domain as localDomain } from 'mastodon/initial_state';
+import {
+  autoPlayGif,
+  me,
+  domain as localDomain,
+  isHideItem,
+} from 'mastodon/initial_state';
 import type { Account } from 'mastodon/models/account';
 import type { MenuItem } from 'mastodon/models/dropdown_menu';
 import {
@@ -221,6 +226,8 @@ export const AccountHeader: React.FC<{
   const hidden = useAppSelector((state) => getAccountHidden(state, accountId));
   const handleLinkClick = useLinks();
 
+  const isHideRelationships = isHideItem('relationships');
+
   const handleBlock = useCallback(() => {
     if (!account) {
       return;
@@ -549,15 +556,15 @@ export const AccountHeader: React.FC<{
         text: intl.formatMessage(messages.add_or_remove_from_exclude_antenna),
         action: handleAddToExcludeAntenna,
       });
-      if (relationship?.followed_by) {
+      if (!isHideRelationships && relationship?.followed_by) {
         arr.push({
           text: intl.formatMessage(messages.add_or_remove_from_circle),
           action: handleAddToCircle,
         });
       }
       arr.push(null);
 
-      if (relationship?.followed_by) {
+      if (!isHideRelationships && relationship?.followed_by) {
         const handleRemoveFromFollowers = () => {
           dispatch(
             openModal({
@@ -710,6 +717,7 @@ export const AccountHeader: React.FC<{
     handleReblogToggle,
     handleReport,
     handleUnblockDomain,
+    isHideRelationships,
   ]);
 
   if (!account) {
@@ -725,6 +733,7 @@ export const AccountHeader: React.FC<{
 
   if (me !== account.id && relationship) {
     if (
+      !isHideRelationships &&
       relationship.followed_by &&
       (relationship.following || relationship.requested)
     ) {
@@ -736,7 +745,7 @@ export const AccountHeader: React.FC<{
           />
         </span>,
       );
-    } else if (relationship.followed_by) {
+    } else if (!isHideRelationships && relationship.followed_by) {
       info.push(
         <span key='followed_by' className='relationship-tag'>
           <FormattedMessage
@@ -745,7 +754,7 @@ export const AccountHeader: React.FC<{
           />
         </span>,
       );
-    } else if (relationship.requested_by) {
+    } else if (!relationship.followed_by && relationship.requested_by) {
       info.push(
         <span key='requested_by' className='relationship-tag'>
           <FormattedMessage

app/javascript/mastodon/locales/ja.json

@@ -55,6 +55,7 @@
   "account.followers": "フォロワー",
   "account.followers.empty": "まだ誰もフォローしていません。",
   "account.followers_counter": "{count, plural, other {{counter} フォロワー}}",
+  "account.followers.hidden_from_me": "この情報はあなた自身の設定によって隠されています。",
   "account.followers_you_know_counter": "あなたと知り合いの{counter}人",
   "account.following": "フォロー中",
   "account.following_counter": "{count, plural, other {{counter} フォロー}}",