Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream

app/javascript/mastodon/features/explore/components/card.jsx

@@ -0,0 +1,88 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { followAccount, unfollowAccount } from 'mastodon/actions/accounts';
+import { dismissSuggestion } from 'mastodon/actions/suggestions';
+import { Avatar } from 'mastodon/components/avatar';
+import { Button } from 'mastodon/components/button';
+import { DisplayName } from 'mastodon/components/display_name';
+import { IconButton } from 'mastodon/components/icon_button';
+import { domain } from 'mastodon/initial_state';
+
+const messages = defineMessages({
+  follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+  dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
+});
+
+export const Card = ({ id, source }) => {
+  const intl = useIntl();
+  const account = useSelector(state => state.getIn(['accounts', id]));
+  const relationship = useSelector(state => state.getIn(['relationships', id]));
+  const dispatch = useDispatch();
+  const following = relationship?.get('following') ?? relationship?.get('requested');
+
+  const handleFollow = useCallback(() => {
+    if (following) {
+      dispatch(unfollowAccount(id));
+    } else {
+      dispatch(followAccount(id));
+    }
+  }, [id, following, dispatch]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissSuggestion(id));
+  }, [id, dispatch]);
+
+  let label;
+
+  switch (source) {
+  case 'friends_of_friends':
+    label = <FormattedMessage id='follow_suggestions.friends_of_friends_longer' defaultMessage='Popular among people you follow' />;
+    break;
+  case 'similar_to_recently_followed':
+    label = <FormattedMessage id='follow_suggestions.similar_to_recently_followed_longer' defaultMessage='Similar to profiles you recently followed' />;
+    break;
+  case 'featured':
+    label = <FormattedMessage id='follow_suggestions.featured_longer' defaultMessage='Hand-picked by the {domain} team' values={{ domain }} />;
+    break;
+  case 'most_followed':
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion_longer' defaultMessage='Popular on {domain}' values={{ domain }} />;
+    break;
+  case 'most_interactions':
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion_longer' defaultMessage='Popular on {domain}' values={{ domain }} />;
+    break;
+  }
+
+  return (
+    <div className='explore__suggestions__card'>
+      <div className='explore__suggestions__card__source'>
+        {label}
+      </div>
+
+      <div className='explore__suggestions__card__body'>
+        <Link to={`/@${account.get('acct')}`}><Avatar account={account} size={48} /></Link>
+
+        <div className='explore__suggestions__card__body__main'>
+          <div className='explore__suggestions__card__body__main__name-button'>
+            <Link className='explore__suggestions__card__body__main__name-button__name' to={`/@${account.get('acct')}`}><DisplayName account={account} /></Link>
+            <IconButton iconComponent={CloseIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+            <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} secondary={following} onClick={handleFollow} />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+Card.propTypes = {
+  id: PropTypes.string.isRequired,
+  source: PropTypes.oneOf(['friends_of_friends', 'similar_to_recently_followed', 'featured', 'most_followed', 'most_interactions']),
+};

app/javascript/mastodon/features/explore/suggestions.jsx

@@ -10,9 +10,10 @@ import { connect } from 'react-redux';
 
 import { fetchSuggestions } from 'mastodon/actions/suggestions';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
-import AccountCard from 'mastodon/features/directory/components/account_card';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
+import { Card } from './components/card';
+
 const mapStateToProps = state => ({
   suggestions: state.getIn(['suggestions', 'items']),
   isLoading: state.getIn(['suggestions', 'isLoading']),
@@ -54,7 +55,11 @@ class Suggestions extends PureComponent {
     return (
       <div className='explore__suggestions scrollable' data-nosnippet>
         {isLoading ? <LoadingIndicator /> : suggestions.map(suggestion => (
-          <AccountCard key={suggestion.get('account')} id={suggestion.get('account')} />
+          <Card
+            key={suggestion.get('account')}
+            id={suggestion.get('account')}
+            source={suggestion.getIn(['sources', 0])}
+          />
         ))}
       </div>
     );

app/javascript/mastodon/features/notifications/components/moderation_warning.tsx

@@ -0,0 +1,78 @@
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import GavelIcon from '@/material-icons/400-24px/gavel.svg?react';
+import { Icon } from 'mastodon/components/icon';
+
+// This needs to be kept in sync with app/models/account_warning.rb
+const messages = defineMessages({
+  none: {
+    id: 'notification.moderation_warning.action_none',
+    defaultMessage: 'Your account has received a moderation warning.',
+  },
+  disable: {
+    id: 'notification.moderation_warning.action_disable',
+    defaultMessage: 'Your account has been disabled.',
+  },
+  mark_statuses_as_sensitive: {
+    id: 'notification.moderation_warning.action_mark_statuses_as_sensitive',
+    defaultMessage: 'Some of your posts have been marked as sensitive.',
+  },
+  delete_statuses: {
+    id: 'notification.moderation_warning.action_delete_statuses',
+    defaultMessage: 'Some of your posts have been removed.',
+  },
+  sensitive: {
+    id: 'notification.moderation_warning.action_sensitive',
+    defaultMessage: 'Your posts will be marked as sensitive from now on.',
+  },
+  silence: {
+    id: 'notification.moderation_warning.action_silence',
+    defaultMessage: 'Your account has been limited.',
+  },
+  suspend: {
+    id: 'notification.moderation_warning.action_suspend',
+    defaultMessage: 'Your account has been suspended.',
+  },
+});
+
+interface Props {
+  action:
+    | 'none'
+    | 'disable'
+    | 'mark_statuses_as_sensitive'
+    | 'delete_statuses'
+    | 'sensitive'
+    | 'silence'
+    | 'suspend';
+  id: string;
+  hidden: boolean;
+}
+
+export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
+  const intl = useIntl();
+
+  if (hidden) {
+    return null;
+  }
+
+  return (
+    <a
+      href={`/disputes/strikes/${id}`}
+      target='_blank'
+      rel='noopener noreferrer'
+      className='notification__moderation-warning'
+    >
+      <Icon id='warning' icon={GavelIcon} />
+
+      <div className='notification__moderation-warning__content'>
+        <p>{intl.formatMessage(messages[action])}</p>
+        <span className='link-button'>
+          <FormattedMessage
+            id='notification.moderation-warning.learn_more'
+            defaultMessage='Learn more'
+          />
+        </span>
+      </div>
+    </a>
+  );
+};

app/javascript/mastodon/features/notifications/components/notification.jsx

@@ -26,6 +26,7 @@ import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import FollowRequestContainer from '../containers/follow_request_container';
 
+import { ModerationWarning } from './moderation_warning';
 import { RelationshipsSeveranceEvent } from './relationships_severance_event';
 import Report from './report';
 
@@ -40,6 +41,7 @@ const messages = defineMessages({
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
   relationshipsSevered: { id: 'notification.relationships_severance_event', defaultMessage: 'Lost connections with {name}' },
+  moderationWarning: { id: 'notification.moderation_warning', defaultMessage: 'Your have received a moderation warning' },
 });
 
 const notificationForScreenReader = (intl, message, timestamp) => {
@@ -383,6 +385,27 @@ class Notification extends ImmutablePureComponent {
     );
   }
 
+  renderModerationWarning (notification) {
+    const { intl, unread, hidden } = this.props;
+    const warning = notification.get('moderation_warning');
+
+    if (!warning) {
+      return null;
+    }
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-moderation-warning focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.moderationWarning), notification.get('created_at'))}>
+          <ModerationWarning
+            action={warning.get('action')}
+            id={warning.get('id')}
+            hidden={hidden}
+          />
+        </div>
+      </HotKeys>
+    );
+  }
+
   renderAdminSignUp (notification, account, link) {
     const { intl, unread } = this.props;
 
@@ -456,6 +479,8 @@ class Notification extends ImmutablePureComponent {
       return this.renderPoll(notification, account);
     case 'severed_relationships':
       return this.renderRelationshipsSevered(notification);
+    case 'moderation_warning':
+      return this.renderModerationWarning(notification);
     case 'admin.sign_up':
       return this.renderAdminSignUp(notification, account, link);
     case 'admin.report':