- {!(suspended || hidden || account.get('moved')) && account.getIn(['relationship', 'requested_by']) &&
- {titleFromAccount(account)}
-
-
-
-
- );
- }
-
-}
-
-export default withRouter(withIdentity(injectIntl(Header)));
diff --git a/app/javascript/flavours/glitch/features/account_gallery/index.jsx b/app/javascript/flavours/glitch/features/account_gallery/index.jsx
index 284713f93d..b40a0cac41 100644
--- a/app/javascript/flavours/glitch/features/account_gallery/index.jsx
+++ b/app/javascript/flavours/glitch/features/account_gallery/index.jsx
@@ -17,7 +17,7 @@ import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
import { getAccountGallery } from 'flavours/glitch/selectors';
import { expandAccountMediaTimeline } from '../../actions/timelines';
-import HeaderContainer from '../account_timeline/containers/header_container';
+import { AccountHeader } from '../account_timeline/components/account_header';
import Column from '../ui/components/column';
import { MediaItem } from './components/media_item';
@@ -205,7 +205,7 @@ class AccountGallery extends ImmutablePureComponent {
- 
}
-
-
-
- {info}
-
-
- {!(suspended || hidden) &&
-
-
-
-
-
-
-
- {!hidden && bellBtn}
- {!hidden && shareBtn}
-
-
-
-
-
- @{username}@{domain}
-
-
-
- {badges.length > 0 && (
-
-
-
- @{username}@{domain}
-
-
- {badges}
-
- )}
-
- {!(suspended || hidden) && (
-
-
- )}
-
- {(account.get('id') !== me && signedIn) &&
-
-
- -
-
- {intl.formatDate(account.get('created_at'), { year: 'numeric', month: 'short', day: '2-digit' })} -
-
-
-
-
-
- {pair.get('verified_at') &&
} -
-
-
diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx b/app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx
new file mode 100644
index 0000000000..29f12fc56e
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx
@@ -0,0 +1,1038 @@
+import { useCallback, useMemo } from 'react';
+
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+import { Helmet } from 'react-helmet';
+import { NavLink } from 'react-router-dom';
+
+import { useLinks } from '@/hooks/useLinks';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react';
+import NotificationsActiveIcon from '@/material-icons/400-24px/notifications_active-fill.svg?react';
+import ShareIcon from '@/material-icons/400-24px/share.svg?react';
+import {
+ followAccount,
+ unblockAccount,
+ unmuteAccount,
+ pinAccount,
+ unpinAccount,
+} from 'flavours/glitch/actions/accounts';
+import { initBlockModal } from 'flavours/glitch/actions/blocks';
+import { mentionCompose, directCompose } from 'flavours/glitch/actions/compose';
+import {
+ initDomainBlockModal,
+ unblockDomain,
+} from 'flavours/glitch/actions/domain_blocks';
+import { openModal } from 'flavours/glitch/actions/modal';
+import { initMuteModal } from 'flavours/glitch/actions/mutes';
+import { initReport } from 'flavours/glitch/actions/reports';
+import { Avatar } from 'flavours/glitch/components/avatar';
+import {
+ Badge,
+ AutomatedBadge,
+ GroupBadge,
+} from 'flavours/glitch/components/badge';
+import { Button } from 'flavours/glitch/components/button';
+import { CopyIconButton } from 'flavours/glitch/components/copy_icon_button';
+import { Icon } from 'flavours/glitch/components/icon';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
+import { DomainPill } from 'flavours/glitch/features/account/components/domain_pill';
+import AccountNoteContainer from 'flavours/glitch/features/account/containers/account_note_container';
+import FollowRequestNoteContainer from 'flavours/glitch/features/account/containers/follow_request_note_container';
+import { useIdentity } from 'flavours/glitch/identity_context';
+import {
+ autoPlayGif,
+ me,
+ domain as localDomain,
+} from 'flavours/glitch/initial_state';
+import type { Account } from 'flavours/glitch/models/account';
+import type { DropdownMenu } from 'flavours/glitch/models/dropdown_menu';
+import type { Relationship } from 'flavours/glitch/models/relationship';
+import {
+ PERMISSION_MANAGE_USERS,
+ PERMISSION_MANAGE_FEDERATION,
+} from 'flavours/glitch/permissions';
+import { getAccountHidden } from 'flavours/glitch/selectors/accounts';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
+
+import { ActionBar } from '../../account/components/action_bar';
+
+import { MemorialNote } from './memorial_note';
+import { MovedNote } from './moved_note';
+
+const messages = defineMessages({
+ unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+ follow: { id: 'account.follow', defaultMessage: 'Follow' },
+ followBack: { id: 'account.follow_back', defaultMessage: 'Follow back' },
+ mutual: { id: 'account.mutual', defaultMessage: 'Mutual' },
+ cancel_follow_request: {
+ id: 'account.cancel_follow_request',
+ defaultMessage: 'Withdraw follow request',
+ },
+ requested: {
+ id: 'account.requested',
+ defaultMessage: 'Awaiting approval. Click to cancel follow request',
+ },
+ unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
+ edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
+ linkVerifiedOn: {
+ id: 'account.link_verified_on',
+ defaultMessage: 'Ownership of this link was checked on {date}',
+ },
+ account_locked: {
+ id: 'account.locked_info',
+ defaultMessage:
+ 'This account privacy status is set to locked. The owner manually reviews who can follow them.',
+ },
+ mention: { id: 'account.mention', defaultMessage: 'Mention @{name}' },
+ direct: { id: 'account.direct', defaultMessage: 'Privately mention @{name}' },
+ unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
+ block: { id: 'account.block', defaultMessage: 'Block @{name}' },
+ mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
+ report: { id: 'account.report', defaultMessage: 'Report @{name}' },
+ share: { id: 'account.share', defaultMessage: "Share @{name}'s profile" },
+ copy: { id: 'account.copy', defaultMessage: 'Copy link to profile' },
+ media: { id: 'account.media', defaultMessage: 'Media' },
+ blockDomain: {
+ id: 'account.block_domain',
+ defaultMessage: 'Block domain {domain}',
+ },
+ unblockDomain: {
+ id: 'account.unblock_domain',
+ defaultMessage: 'Unblock domain {domain}',
+ },
+ hideReblogs: {
+ id: 'account.hide_reblogs',
+ defaultMessage: 'Hide boosts from @{name}',
+ },
+ showReblogs: {
+ id: 'account.show_reblogs',
+ defaultMessage: 'Show boosts from @{name}',
+ },
+ enableNotifications: {
+ id: 'account.enable_notifications',
+ defaultMessage: 'Notify me when @{name} posts',
+ },
+ disableNotifications: {
+ id: 'account.disable_notifications',
+ defaultMessage: 'Stop notifying me when @{name} posts',
+ },
+ pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
+ preferences: {
+ id: 'navigation_bar.preferences',
+ defaultMessage: 'Preferences',
+ },
+ follow_requests: {
+ id: 'navigation_bar.follow_requests',
+ defaultMessage: 'Follow requests',
+ },
+ favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favorites' },
+ lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
+ followed_tags: {
+ id: 'navigation_bar.followed_tags',
+ defaultMessage: 'Followed hashtags',
+ },
+ blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
+ domain_blocks: {
+ id: 'navigation_bar.domain_blocks',
+ defaultMessage: 'Blocked domains',
+ },
+ mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
+ endorse: { id: 'account.endorse', defaultMessage: 'Feature on profile' },
+ unendorse: {
+ id: 'account.unendorse',
+ defaultMessage: "Don't feature on profile",
+ },
+ add_or_remove_from_list: {
+ id: 'account.add_or_remove_from_list',
+ defaultMessage: 'Add or Remove from lists',
+ },
+ admin_account: {
+ id: 'status.admin_account',
+ defaultMessage: 'Open moderation interface for @{name}',
+ },
+ admin_domain: {
+ id: 'status.admin_domain',
+ defaultMessage: 'Open moderation interface for {domain}',
+ },
+ languages: {
+ id: 'account.languages',
+ defaultMessage: 'Change subscribed languages',
+ },
+ openOriginalPage: {
+ id: 'account.open_original_page',
+ defaultMessage: 'Open original page',
+ },
+});
+
+const titleFromAccount = (account: Account) => {
+ const displayName = account.display_name;
+ const acct =
+ account.acct === account.username
+ ? `${account.username}@${localDomain}`
+ : account.acct;
+ const prefix =
+ displayName.trim().length === 0 ? account.username : displayName;
+
+ return `${prefix} (@${acct})`;
+};
+
+const messageForFollowButton = (relationship?: Relationship) => {
+ if (!relationship) return messages.follow;
+
+ if (relationship.get('requested')) {
+ return messages.cancel_follow_request;
+ } else if (relationship.get('following')) {
+ return messages.unfollow;
+ } else if (relationship.get('followed_by')) {
+ return messages.followBack;
+ } else {
+ return messages.follow;
+ }
+};
+
+const dateFormatOptions: Intl.DateTimeFormatOptions = {
+ month: 'short',
+ day: 'numeric',
+ year: 'numeric',
+ hour: '2-digit',
+ minute: '2-digit',
+};
+
+export const AccountHeader: React.FC<{
+ accountId: string;
+ hideTabs?: boolean;
+}> = ({ accountId, hideTabs }) => {
+ const dispatch = useAppDispatch();
+ const intl = useIntl();
+ const { signedIn, permissions } = useIdentity();
+ const account = useAppSelector((state) => state.accounts.get(accountId));
+ const relationship = useAppSelector((state) =>
+ state.relationships.get(accountId),
+ );
+ const hidden = useAppSelector((state) => getAccountHidden(state, accountId));
+ const handleLinkClick = useLinks();
+
+ const handleFollow = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ if (relationship?.following || relationship?.requested) {
+ dispatch(
+ openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }),
+ );
+ } else {
+ dispatch(followAccount(account.id));
+ }
+ }, [dispatch, account, relationship]);
+
+ const handleBlock = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ if (relationship?.blocking) {
+ dispatch(unblockAccount(account.id));
+ } else {
+ dispatch(initBlockModal(account));
+ }
+ }, [dispatch, account, relationship]);
+
+ const handleMention = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ dispatch(mentionCompose(account));
+ }, [dispatch, account]);
+
+ const handleDirect = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ dispatch(directCompose(account));
+ }, [dispatch, account]);
+
+ const handleReport = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ dispatch(initReport(account));
+ }, [dispatch, account]);
+
+ const handleReblogToggle = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ if (relationship?.showing_reblogs) {
+ dispatch(followAccount(account.id, { reblogs: false }));
+ } else {
+ dispatch(followAccount(account.id, { reblogs: true }));
+ }
+ }, [dispatch, account, relationship]);
+
+ const handleNotifyToggle = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ if (relationship?.notifying) {
+ dispatch(followAccount(account.id, { notify: false }));
+ } else {
+ dispatch(followAccount(account.id, { notify: true }));
+ }
+ }, [dispatch, account, relationship]);
+
+ const handleMute = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ if (relationship?.muting) {
+ dispatch(unmuteAccount(account.id));
+ } else {
+ dispatch(initMuteModal(account));
+ }
+ }, [dispatch, account, relationship]);
+
+ const handleBlockDomain = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ dispatch(initDomainBlockModal(account));
+ }, [dispatch, account]);
+
+ const handleUnblockDomain = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ const domain = account.acct.split('@')[1];
+
+ if (!domain) {
+ return;
+ }
+
+ dispatch(unblockDomain(domain));
+ }, [dispatch, account]);
+
+ const handleEndorseToggle = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ if (relationship?.endorsed) {
+ dispatch(unpinAccount(account.id));
+ } else {
+ dispatch(pinAccount(account.id));
+ }
+ }, [dispatch, account, relationship]);
+
+ const handleAddToList = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ dispatch(
+ openModal({
+ modalType: 'LIST_ADDER',
+ modalProps: {
+ accountId: account.id,
+ },
+ }),
+ );
+ }, [dispatch, account]);
+
+ const handleChangeLanguages = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ dispatch(
+ openModal({
+ modalType: 'SUBSCRIBED_LANGUAGES',
+ modalProps: {
+ accountId: account.id,
+ },
+ }),
+ );
+ }, [dispatch, account]);
+
+ const handleInteractionModal = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ dispatch(
+ openModal({
+ modalType: 'INTERACTION',
+ modalProps: {
+ type: 'follow',
+ accountId: account.id,
+ url: account.uri,
+ },
+ }),
+ );
+ }, [dispatch, account]);
+
+ const handleOpenAvatar = useCallback(
+ (e: React.MouseEvent) => {
+ if (e.button !== 0 || e.ctrlKey || e.metaKey) {
+ return;
+ }
+
+ e.preventDefault();
+
+ if (!account) {
+ return;
+ }
+
+ dispatch(
+ openModal({
+ modalType: 'IMAGE',
+ modalProps: {
+ src: account.avatar,
+ alt: '',
+ },
+ }),
+ );
+ },
+ [dispatch, account],
+ );
+
+ const handleShare = useCallback(() => {
+ if (!account) {
+ return;
+ }
+
+ void navigator.share({
+ url: account.url,
+ });
+ }, [account]);
+
+ const handleEditProfile = useCallback(() => {
+ window.open('/settings/profile', '_blank');
+ }, []);
+
+ const handleMouseEnter = useCallback(
+ ({ currentTarget }: React.MouseEvent) => {
+ if (autoPlayGif) {
+ return;
+ }
+
+ currentTarget
+ .querySelectorAll('.custom-emoji')
+ .forEach((emoji) => {
+ emoji.src = emoji.getAttribute('data-original') ?? '';
+ });
+ },
+ [],
+ );
+
+ const handleMouseLeave = useCallback(
+ ({ currentTarget }: React.MouseEvent) => {
+ if (autoPlayGif) {
+ return;
+ }
+
+ currentTarget
+ .querySelectorAll('.custom-emoji')
+ .forEach((emoji) => {
+ emoji.src = emoji.getAttribute('data-static') ?? '';
+ });
+ },
+ [],
+ );
+
+ const suspended = account?.suspended;
+ const isRemote = account?.acct !== account?.username;
+ const remoteDomain = isRemote ? account?.acct.split('@')[1] : null;
+
+ const menu = useMemo(() => {
+ const arr: DropdownMenu = [];
+
+ if (!account) {
+ return arr;
+ }
+
+ if (signedIn && account.id !== me && !account.suspended) {
+ arr.push({
+ text: intl.formatMessage(messages.mention, {
+ name: account.username,
+ }),
+ action: handleMention,
+ });
+ arr.push({
+ text: intl.formatMessage(messages.direct, {
+ name: account.username,
+ }),
+ action: handleDirect,
+ });
+ arr.push(null);
+ }
+
+ if (isRemote) {
+ arr.push({
+ text: intl.formatMessage(messages.openOriginalPage),
+ href: account.url,
+ });
+ arr.push(null);
+ }
+
+ if (account.id === me) {
+ arr.push({
+ text: intl.formatMessage(messages.edit_profile),
+ href: '/settings/profile',
+ });
+ arr.push({
+ text: intl.formatMessage(messages.preferences),
+ href: '/settings/preferences',
+ });
+ arr.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
+ arr.push(null);
+ arr.push({
+ text: intl.formatMessage(messages.follow_requests),
+ to: '/follow_requests',
+ });
+ arr.push({
+ text: intl.formatMessage(messages.favourites),
+ to: '/favourites',
+ });
+ arr.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
+ arr.push({
+ text: intl.formatMessage(messages.followed_tags),
+ to: '/followed_tags',
+ });
+ arr.push(null);
+ arr.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
+ arr.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
+ arr.push({
+ text: intl.formatMessage(messages.domain_blocks),
+ to: '/domain_blocks',
+ });
+ } else if (signedIn) {
+ if (relationship?.following) {
+ if (!relationship.muting) {
+ if (relationship.showing_reblogs) {
+ arr.push({
+ text: intl.formatMessage(messages.hideReblogs, {
+ name: account.username,
+ }),
+ action: handleReblogToggle,
+ });
+ } else {
+ arr.push({
+ text: intl.formatMessage(messages.showReblogs, {
+ name: account.username,
+ }),
+ action: handleReblogToggle,
+ });
+ }
+
+ arr.push({
+ text: intl.formatMessage(messages.languages),
+ action: handleChangeLanguages,
+ });
+ arr.push(null);
+ }
+
+ arr.push({
+ text: intl.formatMessage(
+ account.getIn(['relationship', 'endorsed'])
+ ? messages.unendorse
+ : messages.endorse,
+ ),
+ action: handleEndorseToggle,
+ });
+ arr.push({
+ text: intl.formatMessage(messages.add_or_remove_from_list),
+ action: handleAddToList,
+ });
+ arr.push(null);
+ }
+
+ if (relationship?.muting) {
+ arr.push({
+ text: intl.formatMessage(messages.unmute, {
+ name: account.username,
+ }),
+ action: handleMute,
+ });
+ } else {
+ arr.push({
+ text: intl.formatMessage(messages.mute, {
+ name: account.username,
+ }),
+ action: handleMute,
+ dangerous: true,
+ });
+ }
+
+ if (relationship?.blocking) {
+ arr.push({
+ text: intl.formatMessage(messages.unblock, {
+ name: account.username,
+ }),
+ action: handleBlock,
+ });
+ } else {
+ arr.push({
+ text: intl.formatMessage(messages.block, {
+ name: account.username,
+ }),
+ action: handleBlock,
+ dangerous: true,
+ });
+ }
+
+ if (!account.suspended) {
+ arr.push({
+ text: intl.formatMessage(messages.report, {
+ name: account.username,
+ }),
+ action: handleReport,
+ dangerous: true,
+ });
+ }
+ }
+
+ if (signedIn && isRemote) {
+ arr.push(null);
+
+ if (relationship?.domain_blocking) {
+ arr.push({
+ text: intl.formatMessage(messages.unblockDomain, {
+ domain: remoteDomain,
+ }),
+ action: handleUnblockDomain,
+ });
+ } else {
+ arr.push({
+ text: intl.formatMessage(messages.blockDomain, {
+ domain: remoteDomain,
+ }),
+ action: handleBlockDomain,
+ dangerous: true,
+ });
+ }
+ }
+
+ if (
+ (account.id !== me &&
+ (permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) ||
+ (isRemote &&
+ (permissions & PERMISSION_MANAGE_FEDERATION) ===
+ PERMISSION_MANAGE_FEDERATION)
+ ) {
+ arr.push(null);
+ if ((permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) {
+ arr.push({
+ text: intl.formatMessage(messages.admin_account, {
+ name: account.username,
+ }),
+ href: `/admin/accounts/${account.id}`,
+ });
+ }
+ if (
+ isRemote &&
+ (permissions & PERMISSION_MANAGE_FEDERATION) ===
+ PERMISSION_MANAGE_FEDERATION
+ ) {
+ arr.push({
+ text: intl.formatMessage(messages.admin_domain, {
+ domain: remoteDomain,
+ }),
+ href: `/admin/instances/${remoteDomain}`,
+ });
+ }
+ }
+
+ return arr;
+ }, [
+ account,
+ relationship,
+ permissions,
+ isRemote,
+ remoteDomain,
+ intl,
+ signedIn,
+ handleAddToList,
+ handleBlock,
+ handleBlockDomain,
+ handleChangeLanguages,
+ handleDirect,
+ handleEndorseToggle,
+ handleMention,
+ handleMute,
+ handleReblogToggle,
+ handleReport,
+ handleUnblockDomain,
+ ]);
+
+ if (!account) {
+ return null;
+ }
+
+ let actionBtn, bellBtn, lockedIcon, shareBtn;
+
+ const info = [];
+
+ if (me !== account.id && relationship?.followed_by) {
+ info.push(
+
+ {role.get('name')}}
+ domain={domain}
+ roleId={role.get('id')}
+ />,
+ );
+ });
+
+ return (
+
);
-
-export default MemorialNote;
diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx
deleted file mode 100644
index cb8836ef7c..0000000000
--- a/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { FormattedMessage } from 'react-intl';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import { AvatarOverlay } from '../../../components/avatar_overlay';
-import { DisplayName } from '../../../components/display_name';
-import { Permalink } from '../../../components/permalink';
-
-export default class MovedNote extends ImmutablePureComponent {
-
- static propTypes = {
- from: ImmutablePropTypes.map.isRequired,
- to: ImmutablePropTypes.map.isRequired,
- };
-
- render () {
- const { from, to } = this.props;
-
- return (
-
+ {!hidden && account.memorial &&
+ {titleFromAccount(account)}
+
+
+
+
+ );
+};
diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
deleted file mode 100644
index 10a035a0fc..0000000000
--- a/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { FormattedMessage } from 'react-intl';
-
-import { NavLink } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import ActionBar from '../../account/components/action_bar';
-import InnerHeader from '../../account/components/header';
-
-import MemorialNote from './memorial_note';
-import MovedNote from './moved_note';
-
-class Header extends ImmutablePureComponent {
-
- static propTypes = {
- account: ImmutablePropTypes.record,
- onFollow: PropTypes.func.isRequired,
- onBlock: PropTypes.func.isRequired,
- onMention: PropTypes.func.isRequired,
- onDirect: PropTypes.func.isRequired,
- onReblogToggle: PropTypes.func.isRequired,
- onReport: PropTypes.func.isRequired,
- onMute: PropTypes.func.isRequired,
- onBlockDomain: PropTypes.func.isRequired,
- onUnblockDomain: PropTypes.func.isRequired,
- onEndorseToggle: PropTypes.func.isRequired,
- onAddToList: PropTypes.func.isRequired,
- onChangeLanguages: PropTypes.func.isRequired,
- onInteractionModal: PropTypes.func.isRequired,
- onOpenAvatar: PropTypes.func.isRequired,
- hideTabs: PropTypes.bool,
- domain: PropTypes.string.isRequired,
- hidden: PropTypes.bool,
- };
-
- handleFollow = () => {
- this.props.onFollow(this.props.account);
- };
-
- handleBlock = () => {
- this.props.onBlock(this.props.account);
- };
-
- handleMention = () => {
- this.props.onMention(this.props.account);
- };
-
- handleDirect = () => {
- this.props.onDirect(this.props.account);
- };
-
- handleReport = () => {
- this.props.onReport(this.props.account);
- };
-
- handleReblogToggle = () => {
- this.props.onReblogToggle(this.props.account);
- };
-
- handleNotifyToggle = () => {
- this.props.onNotifyToggle(this.props.account);
- };
-
- handleMute = () => {
- this.props.onMute(this.props.account);
- };
-
- handleBlockDomain = () => {
- this.props.onBlockDomain(this.props.account);
- };
-
- handleUnblockDomain = () => {
- const domain = this.props.account.get('acct').split('@')[1];
-
- if (!domain) return;
-
- this.props.onUnblockDomain(domain);
- };
-
- handleEndorseToggle = () => {
- this.props.onEndorseToggle(this.props.account);
- };
-
- handleAddToList = () => {
- this.props.onAddToList(this.props.account);
- };
-
- handleEditAccountNote = () => {
- this.props.onEditAccountNote(this.props.account);
- };
-
- handleChangeLanguages = () => {
- this.props.onChangeLanguages(this.props.account);
- };
-
- handleInteractionModal = () => {
- this.props.onInteractionModal(this.props.account);
- };
-
- handleOpenAvatar = () => {
- this.props.onOpenAvatar(this.props.account);
- };
-
- render () {
- const { account, hidden, hideTabs } = this.props;
-
- if (account === null) {
- return null;
- }
-
- return (
-
+ {!(suspended || hidden || account.moved) &&
+ relationship?.requested_by && (
+
+
+
+
+ )}
+
+
+ {info}
+
+ {!(suspended || hidden) && (
+
+
+
+
+
+
+
+ {!hidden && bellBtn}
+ {!hidden && shareBtn}
+
+
+
+
+
+
+ @{username}
+ @{domain}
+
+
+
+
+ {badges.length > 0 && (
+
+
+
+
+ @{username}
+ @{domain}
+
+
+ {badges}
+ )}
+
+ {!(suspended || hidden) && (
+
+
+ )}
+
+ {account.id !== me && signedIn && (
+
+
+
+ -
+
-
+
+
+ - + {intl.formatDate(account.created_at, { + year: 'numeric', + month: 'short', + day: '2-digit', + })} + +
-
+
+
+
-
+ {pair.verified_at && (
+
+
+ + )}{' '} + +
+
+
+
+
+
+
+
+
+ )}
+
+
- {(!hidden && account.get('memorial')) &&
- );
- }
-
-}
-
-export default Header;
diff --git a/app/javascript/mastodon/features/account_timeline/components/memorial_note.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/memorial_note.tsx
similarity index 53%
rename from app/javascript/mastodon/features/account_timeline/components/memorial_note.jsx
rename to app/javascript/flavours/glitch/features/account_timeline/components/memorial_note.tsx
index a04808f1ca..19e6f0ed22 100644
--- a/app/javascript/mastodon/features/account_timeline/components/memorial_note.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/components/memorial_note.tsx
@@ -1,11 +1,12 @@
import { FormattedMessage } from 'react-intl';
-const MemorialNote = () => (
+export const MemorialNote: React.FC = () => (
-
- )}
-
-
-
- );
- }
-
-}
diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.tsx b/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.tsx
new file mode 100644
index 0000000000..7ef5726c72
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.tsx
@@ -0,0 +1,56 @@
+import { FormattedMessage } from 'react-intl';
+
+import { AvatarOverlay } from 'flavours/glitch/components/avatar_overlay';
+import { DisplayName } from 'flavours/glitch/components/display_name';
+import { Permalink } from 'flavours/glitch/components/permalink';
+import { useAppSelector } from 'flavours/glitch/store';
+
+export const MovedNote: React.FC<{
+ accountId: string;
+ targetAccountId: string;
+}> = ({ accountId, targetAccountId }) => {
+ const from = useAppSelector((state) => state.accounts.get(accountId));
+ const to = useAppSelector((state) => state.accounts.get(targetAccountId));
+
+ return (
+
- }} />
-
-
-
-
-
-
-
-
+
+ );
+};
diff --git a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
deleted file mode 100644
index 3ceb201e2f..0000000000
--- a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
+++ /dev/null
@@ -1,147 +0,0 @@
-import { injectIntl } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import {
- followAccount,
- unblockAccount,
- unmuteAccount,
- pinAccount,
- unpinAccount,
-} from '../../../actions/accounts';
-import { initBlockModal } from '../../../actions/blocks';
-import {
- mentionCompose,
- directCompose,
-} from '../../../actions/compose';
-import { initDomainBlockModal, unblockDomain } from '../../../actions/domain_blocks';
-import { openModal } from '../../../actions/modal';
-import { initMuteModal } from '../../../actions/mutes';
-import { initReport } from '../../../actions/reports';
-import { makeGetAccount, getAccountHidden } from '../../../selectors';
-import Header from '../components/header';
-
-const makeMapStateToProps = () => {
- const getAccount = makeGetAccount();
-
- const mapStateToProps = (state, { accountId }) => ({
- account: getAccount(state, accountId),
- domain: state.getIn(['meta', 'domain']),
- hidden: getAccountHidden(state, accountId),
- });
-
- return mapStateToProps;
-};
-
-const mapDispatchToProps = (dispatch) => ({
-
- onFollow (account) {
- if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
- dispatch(openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }));
- } else {
- dispatch(followAccount(account.get('id')));
- }
- },
-
- onInteractionModal (account) {
- dispatch(openModal({
- modalType: 'INTERACTION',
- modalProps: {
- type: 'follow',
- accountId: account.get('id'),
- url: account.get('uri'),
- },
- }));
- },
-
- onBlock (account) {
- if (account.getIn(['relationship', 'blocking'])) {
- dispatch(unblockAccount(account.get('id')));
- } else {
- dispatch(initBlockModal(account));
- }
- },
-
- onMention (account) {
- dispatch(mentionCompose(account));
- },
-
- onDirect (account) {
- dispatch(directCompose(account));
- },
-
- onReblogToggle (account) {
- if (account.getIn(['relationship', 'showing_reblogs'])) {
- dispatch(followAccount(account.get('id'), { reblogs: false }));
- } else {
- dispatch(followAccount(account.get('id'), { reblogs: true }));
- }
- },
-
- onEndorseToggle (account) {
- if (account.getIn(['relationship', 'endorsed'])) {
- dispatch(unpinAccount(account.get('id')));
- } else {
- dispatch(pinAccount(account.get('id')));
- }
- },
-
- onNotifyToggle (account) {
- if (account.getIn(['relationship', 'notifying'])) {
- dispatch(followAccount(account.get('id'), { notify: false }));
- } else {
- dispatch(followAccount(account.get('id'), { notify: true }));
- }
- },
-
- onReport (account) {
- dispatch(initReport(account));
- },
-
- onMute (account) {
- if (account.getIn(['relationship', 'muting'])) {
- dispatch(unmuteAccount(account.get('id')));
- } else {
- dispatch(initMuteModal(account));
- }
- },
-
- onBlockDomain (account) {
- dispatch(initDomainBlockModal(account));
- },
-
- onUnblockDomain (domain) {
- dispatch(unblockDomain(domain));
- },
-
- onAddToList (account) {
- dispatch(openModal({
- modalType: 'LIST_ADDER',
- modalProps: {
- accountId: account.get('id'),
- },
- }));
- },
-
- onChangeLanguages (account) {
- dispatch(openModal({
- modalType: 'SUBSCRIBED_LANGUAGES',
- modalProps: {
- accountId: account.get('id'),
- },
- }));
- },
-
- onOpenAvatar (account) {
- dispatch(openModal({
- modalType: 'IMAGE',
- modalProps: {
- src: account.get('avatar'),
- alt: account.get('acct'),
- },
- }));
- },
-
-});
-
-export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Header));
diff --git a/app/javascript/flavours/glitch/features/account_timeline/index.jsx b/app/javascript/flavours/glitch/features/account_timeline/index.jsx
index 813e0c7a31..e5e8da6722 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/index.jsx
@@ -11,7 +11,7 @@ import { TimelineHint } from 'flavours/glitch/components/timeline_hint';
import ProfileColumnHeader from 'flavours/glitch/features/account/components/profile_column_header';
import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
-import { getAccountHidden } from 'flavours/glitch/selectors';
+import { getAccountHidden } from 'flavours/glitch/selectors/accounts';
import { useAppSelector } from 'flavours/glitch/store';
import { lookupAccount, fetchAccount } from '../../actions/accounts';
@@ -21,8 +21,8 @@ import { LoadingIndicator } from '../../components/loading_indicator';
import StatusList from '../../components/status_list';
import Column from '../ui/components/column';
+import { AccountHeader } from './components/account_header';
import { LimitedAccountHint } from './components/limited_account_hint';
-import HeaderContainer from './containers/header_container';
const emptyList = ImmutableList();
@@ -199,7 +199,7 @@ class AccountTimeline extends ImmutablePureComponent {
+
+
+
+ ),
+ }}
+ />
+
+
+
+
+
+
+
+
+
+
+
+
{!hidden && account.memorial &&
(
+export const MemorialNote: React.FC = () => (
);
-
-export default MemorialNote;
diff --git a/app/javascript/mastodon/features/account_timeline/components/moved_note.jsx b/app/javascript/mastodon/features/account_timeline/components/moved_note.jsx
deleted file mode 100644
index 2c996ff769..0000000000
--- a/app/javascript/mastodon/features/account_timeline/components/moved_note.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { FormattedMessage } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import { AvatarOverlay } from '../../../components/avatar_overlay';
-import { DisplayName } from '../../../components/display_name';
-
-export default class MovedNote extends ImmutablePureComponent {
-
- static propTypes = {
- from: ImmutablePropTypes.map.isRequired,
- to: ImmutablePropTypes.map.isRequired,
- };
-
- render () {
- const { from, to } = this.props;
-
- return (
-
-
-
- );
- }
-
-}
diff --git a/app/javascript/mastodon/features/account_timeline/components/moved_note.tsx b/app/javascript/mastodon/features/account_timeline/components/moved_note.tsx
new file mode 100644
index 0000000000..51dbb93c8b
--- /dev/null
+++ b/app/javascript/mastodon/features/account_timeline/components/moved_note.tsx
@@ -0,0 +1,53 @@
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { AvatarOverlay } from 'mastodon/components/avatar_overlay';
+import { DisplayName } from 'mastodon/components/display_name';
+import { useAppSelector } from 'mastodon/store';
+
+export const MovedNote: React.FC<{
+ accountId: string;
+ targetAccountId: string;
+}> = ({ accountId, targetAccountId }) => {
+ const from = useAppSelector((state) => state.accounts.get(accountId));
+ const to = useAppSelector((state) => state.accounts.get(targetAccountId));
+
+ return (
+
- }} />
-
-
-
-
-
-
+
+ );
+};
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index 2cd88aab41..75f4720fb3 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -120,7 +120,7 @@ class ComposeForm extends ImmutablePureComponent {
return;
}
- this.props.onSubmit(missingAltTextModal && this.props.missingAltText);
+ this.props.onSubmit(missingAltTextModal && this.props.missingAltText && this.props.privacy !== 'direct');
if (e) {
e.preventDefault();
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index aebf906f94..2eec42633d 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -697,6 +697,7 @@
"poll_button.remove_poll": "Премахване на анкета",
"privacy.change": "Промяна на поверителността на публикация",
"privacy.direct.long": "Споменатите в публикацията",
+ "privacy.direct.short": "Частно споменаване",
"privacy.private.long": "Само последователите ви",
"privacy.private.short": "Последователи",
"privacy.public.long": "Всеки във и извън Mastodon",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 36609f6ec1..273f8c3aeb 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -195,7 +195,7 @@
"compose_form.publish": "Publicar",
"compose_form.publish_form": "Nueva publicación",
"compose_form.reply": "Respuesta",
- "compose_form.save_changes": "Actualización",
+ "compose_form.save_changes": "Actualizar",
"compose_form.spoiler.marked": "Quitar advertencia de contenido",
"compose_form.spoiler.unmarked": "Añadir advertencia de contenido",
"compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index f934277a28..629ee484ae 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -218,6 +218,10 @@
"confirmations.logout.confirm": "خروج از حساب",
"confirmations.logout.message": "مطمئنید میخواهید خارج شوید؟",
"confirmations.logout.title": "خروج؟",
+ "confirmations.missing_alt_text.confirm": "متن جایگزین را اضافه کنید",
+ "confirmations.missing_alt_text.message": "پست شما حاوی رسانه بدون متن جایگزین است. افزودن توضیحات کمک می کند تا محتوای شما برای افراد بیشتری قابل دسترسی باشد.",
+ "confirmations.missing_alt_text.secondary": "به هر حال پست کن",
+ "confirmations.missing_alt_text.title": "متن جایگزین اضافه شود؟",
"confirmations.mute.confirm": "خموش",
"confirmations.redraft.confirm": "حذف و بازنویسی",
"confirmations.redraft.message": "مطمئنید که میخواهید این فرسته را حذف کنید و از نو بنویسید؟ با این کار تقویتها و پسندهایش از دست رفته و پاسخها به آن بیمرجع میشود.",
@@ -693,6 +697,7 @@
"poll_button.remove_poll": "برداشتن نظرسنجی",
"privacy.change": "تغییر محرمانگی فرسته",
"privacy.direct.long": "هرکسی که در فرسته نام برده شده",
+ "privacy.direct.short": "ذکر خصوصی",
"privacy.private.long": "تنها پیگیرندگانتان",
"privacy.private.short": "پیگیرندگان",
"privacy.public.long": "هرکسی در و بیرون از ماستودون",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index dfc227fb77..0b6333c44e 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -598,11 +598,11 @@
"notification_requests.confirm_accept_multiple.button": "{count, plural, one {Samþykkja beiðni} other {Samþykkja beiðnir}}",
"notification_requests.confirm_accept_multiple.message": "Þú ert að fara að samþykkja {count, plural, one {eina beiðni um tilkynningar} other {# beiðnir um tilkynningar}}. Ertu viss um að þú viljir halda áfram?",
"notification_requests.confirm_accept_multiple.title": "Samþykkja beiðnir um tilkynningar?",
- "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Afgreiða beiðni} other {Afgreiða beiðnir}}",
+ "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Hafna beiðni} other {Hafna beiðnum}}",
"notification_requests.confirm_dismiss_multiple.message": "Þú ert að fara að hunsa {count, plural, one {eina beiðni um tilkynningar} other {# beiðnir um tilkynningar}}. Þú munt ekki eiga auðvelt með að skoða {count, plural, one {hana} other {þær}} aftur síðar. Ertu viss um að þú viljir halda áfram?",
"notification_requests.confirm_dismiss_multiple.title": "Hunsa beiðnir um tilkynningar?",
- "notification_requests.dismiss": "Afgreiða",
- "notification_requests.dismiss_multiple": "{count, plural, one {Afgreiða # beiðni…} other {Afgreiða # beiðnir…}}",
+ "notification_requests.dismiss": "Hafna",
+ "notification_requests.dismiss_multiple": "{count, plural, one {Hafna # beiðni…} other {Hafna # beiðnum…}}",
"notification_requests.edit_selection": "Breyta",
"notification_requests.exit_selection": "Lokið",
"notification_requests.explainer_for_limited_account": "Tilkynningar frá þessum notanda hafa verið síaðar þar sem aðgangur hans hefur verið takmarkaður af umsjónarmanni.",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 040da68243..10b09e6947 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -311,6 +311,7 @@
"filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
"filter_modal.select_filter.title": "Filtrēt šo ziņu",
"filter_modal.title.status": "Filtrēt ziņu",
+ "filtered_notifications_banner.title": "Filtrētie paziņojumi",
"firehose.all": "Visi",
"firehose.local": "Šis serveris",
"firehose.remote": "Citi serveri",
@@ -321,6 +322,8 @@
"follow_suggestions.dismiss": "Vairs nerādīt",
"follow_suggestions.friends_of_friends_longer": "Populārs to cilvēku vidū, kuriem tu seko",
"follow_suggestions.personalized_suggestion": "Pielāgots ieteikums",
+ "follow_suggestions.popular_suggestion": "Populārs ieteikums",
+ "follow_suggestions.popular_suggestion_longer": "Populārs {domain}",
"follow_suggestions.similar_to_recently_followed_longer": "Līdzīgi profieliem, kuriem nesen sāki sekot",
"follow_suggestions.view_all": "Skatīt visu",
"follow_suggestions.who_to_follow": "Kam sekot",
@@ -496,6 +499,7 @@
"notifications.column_settings.filter_bar.category": "Atrās atlasīšanas josla",
"notifications.column_settings.follow": "Jauni sekotāji:",
"notifications.column_settings.follow_request": "Jauni sekošanas pieprasījumi:",
+ "notifications.column_settings.group": "Grupēt",
"notifications.column_settings.mention": "Pieminēšanas:",
"notifications.column_settings.poll": "Aptaujas rezultāti:",
"notifications.column_settings.push": "Uznirstošie paziņojumi",
@@ -520,6 +524,7 @@
"notifications.permission_denied_alert": "Darbvirsmas paziņojumus nevar iespējot, jo pārlūkprogrammai atļauja tika iepriekš atteikta",
"notifications.permission_required": "Darbvirsmas paziņojumi nav pieejami, jo nav piešķirta nepieciešamā atļauja.",
"notifications.policy.accept": "Pieņemt",
+ "notifications.policy.drop": "Ignorēt",
"notifications.policy.filter_new_accounts_title": "Jauni konti",
"notifications.policy.filter_not_followers_title": "Cilvēki, kuri Tev neseko",
"notifications.policy.filter_not_following_hint": "Līdz tos pašrocīgi apstiprināsi",
@@ -527,6 +532,7 @@
"notifications_permission_banner.enable": "Iespējot darbvirsmas paziņojumus",
"notifications_permission_banner.how_to_control": "Lai saņemtu paziņojumus, kad Mastodon nav atvērts, iespējo darbvirsmas paziņojumus. Vari precīzi kontrolēt, kāda veida mijiedarbības rada darbvirsmas paziņojumus, izmantojot augstāk redzamo pogu {icon}, kad tie būs iespējoti.",
"notifications_permission_banner.title": "Nekad nepalaid neko garām",
+ "onboarding.follows.back": "Atpakaļ",
"onboarding.follows.empty": "Diemžēl pašlaik nevar parādīt rezultātus. Vari mēģināt izmantot meklēšanu vai pārlūkot izpētes lapu, lai atrastu cilvēkus, kuriem sekot, vai vēlāk mēģināt vēlreiz.",
"onboarding.profile.discoverable": "Padarīt manu profilu atklājamu",
"onboarding.profile.display_name": "Attēlojamais vārds",
diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index 6e2dc9126c..33d51abed9 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -115,7 +115,7 @@ module Account::Interactions
end
def follow!(other_account, reblogs: nil, notify: nil, languages: nil, uri: nil, rate_limit: false, bypass_limit: false)
- rel = active_relationships.create_with(show_reblogs: reblogs.nil? ? true : reblogs, notify: notify.nil? ? false : notify, languages: languages, uri: uri, rate_limit: rate_limit, bypass_follow_limit: bypass_limit)
+ rel = active_relationships.create_with(show_reblogs: reblogs.nil? || reblogs, notify: notify.nil? ? false : notify, languages: languages, uri: uri, rate_limit: rate_limit, bypass_follow_limit: bypass_limit)
.find_or_create_by!(target_account: other_account)
rel.show_reblogs = reblogs unless reblogs.nil?
@@ -128,7 +128,7 @@ module Account::Interactions
end
def request_follow!(other_account, reblogs: nil, notify: nil, languages: nil, uri: nil, rate_limit: false, bypass_limit: false)
- rel = follow_requests.create_with(show_reblogs: reblogs.nil? ? true : reblogs, notify: notify.nil? ? false : notify, uri: uri, languages: languages, rate_limit: rate_limit, bypass_follow_limit: bypass_limit)
+ rel = follow_requests.create_with(show_reblogs: reblogs.nil? || reblogs, notify: notify.nil? ? false : notify, uri: uri, languages: languages, rate_limit: rate_limit, bypass_follow_limit: bypass_limit)
.find_or_create_by!(target_account: other_account)
rel.show_reblogs = reblogs unless reblogs.nil?
diff --git a/app/views/admin/trends/tags/_tag.html.haml b/app/views/admin/trends/tags/_tag.html.haml
index 1686c46652..91a484d46c 100644
--- a/app/views/admin/trends/tags/_tag.html.haml
+++ b/app/views/admin/trends/tags/_tag.html.haml
@@ -13,7 +13,7 @@
- if tag.trendable?
·
- %abbr{ title: t('admin.trends.tags.current_score', score: tag.trend.score) }= t('admin.trends.tags.trending_rank', rank: tag.trend.rank + 1)
+ %abbr{ title: t('admin.trends.tags.current_score', score: tag.trend.score) }= t('admin.trends.tags.trending_rank', rank: tag.trend.rank)
- if tag.decaying?
·
diff --git a/app/views/statuses/show.html.haml b/app/views/statuses/show.html.haml
index f669885de0..cc779f4370 100644
--- a/app/views/statuses/show.html.haml
+++ b/app/views/statuses/show.html.haml
@@ -12,6 +12,8 @@
= opengraph 'og:title', "#{display_name(@account)} (#{acct(@account)})"
= opengraph 'og:url', short_account_status_url(@account, @status)
= opengraph 'og:published_time', @status.created_at.iso8601
+ - if @status.language.present?
+ = opengraph 'og:locale', @status.language
= opengraph 'profile:username', acct(@account)[1..]
= render 'og_description', activity: @status
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index a688a2a7d2..09825046fc 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -194,7 +194,7 @@ ko:
destroy_domain_allow: 도메인 허용 삭제
destroy_domain_block: 도메인 차단 삭제
destroy_email_domain_block: 이메일 도메인 차단 삭제
- destroy_instance: 도메인 제거
+ destroy_instance: 도메인 퍼지
destroy_ip_block: IP 규칙 삭제
destroy_relay: 릴레이 삭제
destroy_status: 게시물 삭제
@@ -536,7 +536,7 @@ ko:
title: 중재
private_comment: 비공개 주석
public_comment: 공개 주석
- purge: 제거
+ purge: 퍼지
purge_description_html: 이 도메인이 영구적으로 오프라인 상태라고 생각되면, 스토리지에서 이 도메인의 모든 계정 레코드와 관련 데이터를 삭제할 수 있습니다. 이 작업은 시간이 좀 걸릴 수 있습니다.
title: 연합
total_blocked_by_us: 우리에게 차단 됨
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index c3cf3692be..0f73f7f6a0 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -137,6 +137,7 @@ fa:
admin_email: اخطارهای حقوقی شامل اخطارهای متقابل، دستورها دادگاه، درخواستهای حذف و درخواستهای اجرای قانون است.
arbitration_address: میتواند مانند آدرس فیزیکی بالا باشد، یا در صورت استفاده از ایمیل، «N/A» باشد
arbitration_website: اگر از ایمیل استفاده می کنید، می تواند یک فرم وب یا "N/A" باشد
+ choice_of_law: شهر، منطقه، قلمرو یا ایالتی که قوانین ماهوی داخلی آن بر هر یک از دعاوی حاکم است.
dmca_address: برای اپراتورهای ایالات متحده، از آدرس ثبت شده در دایرکتوری نماینده تعیین شده DMCA استفاده کنید. یک P.O. فهرست جعبه در صورت درخواست مستقیم در دسترس است، از درخواست چشم پوشی از صندوق پست دفتر پست DMCA برای ایمیل به دفتر حق نسخه برداری استفاده کنید و توضیح دهید که شما یک ناظر محتوای خانگی هستید که از انتقام یا تلافی برای اعمال خود می ترسید و باید از P.O استفاده کنید. کادری برای حذف آدرس خانه شما از نمای عمومی.
dmca_email: میتواند همان ایمیلی باشد که برای “آدرس ایمیل برای اطلاعیههای قانونی“ در بالا استفاده شده است
domain: شناسایی منحصر به فرد سرویس آنلاینی که ارائه می کنید.
@@ -233,6 +234,7 @@ fa:
setting_display_media_show_all: نمایش همه
setting_expand_spoilers: همیشه فرستههایی را که هشدار محتوا دارند کامل نشان بده
setting_hide_network: نهفتن شبکهٔ ارتباطی
+ setting_missing_alt_text_modal: نمایش گفتگوی تایید قبل از ارسال رسانه بدون متن جایگزین
setting_reduce_motion: کاستن از حرکت در پویانماییها
setting_system_font_ui: بهکاربردن قلم پیشفرض سیستم
setting_system_scrollbars_ui: از نوار اسکرول پیش فرض سیستم استفاده کنید
@@ -337,6 +339,7 @@ fa:
admin_email: آدرس ایمیل برای اطلاعیه های حقوقی
arbitration_address: آدرس فیزیکی اعلامیه های داوری
arbitration_website: وب سایت ارسال اخطارهای داوری
+ choice_of_law: انتخاب قانون
dmca_address: آدرس فیزیکی اعلامیههای DMCA/حق نسخهبرداری
dmca_email: آدرس ایمیل برای اعلامیههای DMCA/حق نسخهبرداری
domain: دامنه
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 9d0b55c9bc..d70639e4a5 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -337,6 +337,7 @@ ko:
admin_email: 법적 조치를 위한 이메일 주소
arbitration_address: 중재 통지를 위한 실제 주소
arbitration_website: 중재 통지를 제출하기 위한 웹사이트
+ choice_of_law: 준거법 지정
dmca_address: DMCA/저작권 통지를 위한 실제 주소
dmca_email: DMCA/저작권 통지를 위한 이메일 주소
domain: 도메인
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index a048fdb99e..d016aee1b3 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -137,6 +137,7 @@ pl:
admin_email: Zawiadomienia prawne obejmują środki zapobiegawcze, nakazy sądowe, wnioski o popełnienie sprawy oraz wnioski organów ścigania.
arbitration_address: Może być taki sam jak adres fizyczny powyżej lub „N/A” jeśli używasz adresu e-mail
arbitration_website: Może być formularzem internetowym lub „N/A”, jeśli używasz adresu e-mail
+ choice_of_law: Miasto, region, terytorium lub stan, którego wewnętrzne prawo będzie regulowało wszelkie roszczenia.
dmca_address: W przypadku operatorów z USA należy użyć adresu zarejestrowanego w DMCA Designated Agent Directory. Lista skrytek pocztowych dostępna jest na bezpośrednią prośbę użytkownika. Użyj DMCA Agent Post Office Box Waiver Request, aby wysłać email do Copyright Office z informacją, że jesteś domowym administratorm treści i z powodu obawy o zemstę lub odwetu za swoje działania, musisz użyć skrytki pocztowej, żeby usunąć swój adres domowy z dostępu publicznego.
dmca_email: Adres email może być taki sam jak wcześniejszy "adres e-mail przeznaczony do celów prawnych"
domain: Unikalny numer identyfikacji świadczonej przez Ciebie usługi online.
@@ -338,6 +339,7 @@ pl:
admin_email: Adres e-mail przeznaczony do celów prawnych
arbitration_address: Adres fizyczny powiadomień arbitrażowych
arbitration_website: Strona internetowa do składania zgłoszeń arbitrażowych
+ choice_of_law: Wybór prawa
dmca_address: Adres fizyczny dla zgłoszeń naruszenia DMCA/praw autorskich
dmca_email: Adres e-mail dla zgłoszeń naruszenia DMCA/praw autorskich
domain: Domena
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 0ee3ccd9aa..6ad76c0fcf 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -25,10 +25,12 @@ sk:
one: Príspevok
other: Príspevkov
posts_tab_heading: Príspevky
+ self_follow_error: Nieje povolené nasledovať svoj vlastný účet
admin:
account_actions:
action: Vykonaj
already_silenced: Tento účet už bol obmedzený.
+ already_suspended: Tento účet už bol vylúčený.
title: Vykonaj moderovací úkon voči %{acct}
account_moderation_notes:
create: Zanechaj poznámku
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 9b448ae225..5722091910 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -78,7 +78,7 @@ namespace :api, format: false do
end
end
- resources :media, only: [:create, :update, :show]
+ resources :media, only: [:create, :update, :show, :destroy]
resources :blocks, only: [:index]
resources :mutes, only: [:index]
resources :favourites, only: [:index]
diff --git a/lint-staged.config.js b/lint-staged.config.js
index baf5d0d454..63f5258a94 100644
--- a/lint-staged.config.js
+++ b/lint-staged.config.js
@@ -3,7 +3,7 @@ const config = {
'Gemfile|*.{rb,ruby,ru,rake}': 'bin/rubocop --force-exclusion -a',
'*.{js,jsx,ts,tsx}': 'eslint --fix',
'*.{css,scss}': 'stylelint --fix',
- '*.haml': 'bin/haml-lint -a --parallel',
+ '*.haml': 'bin/haml-lint -a',
'**/*.ts?(x)': () => 'tsc -p tsconfig.json --noEmit',
};
diff --git a/spec/controllers/admin/relationships_controller_spec.rb b/spec/controllers/admin/relationships_controller_spec.rb
deleted file mode 100644
index 1d300459f6..0000000000
--- a/spec/controllers/admin/relationships_controller_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::RelationshipsController do
- render_views
-
- let(:user) { Fabricate(:admin_user) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #index' do
- let(:account) { Fabricate(:account) }
-
- it 'returns http success' do
- get :index, params: { account_id: account.id }
-
- expect(response).to have_http_status(:success)
- end
- end
-end
diff --git a/spec/controllers/admin/trends/links/preview_card_providers_controller_spec.rb b/spec/controllers/admin/trends/links/preview_card_providers_controller_spec.rb
deleted file mode 100644
index aadf002dd6..0000000000
--- a/spec/controllers/admin/trends/links/preview_card_providers_controller_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::Trends::Links::PreviewCardProvidersController do
- render_views
-
- let(:user) { Fabricate(:admin_user) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #index' do
- it 'returns http success' do
- get :index
-
- expect(response).to have_http_status(:success)
- end
- end
-end
diff --git a/spec/controllers/admin/trends/links_controller_spec.rb b/spec/controllers/admin/trends/links_controller_spec.rb
deleted file mode 100644
index cd2cf6b852..0000000000
--- a/spec/controllers/admin/trends/links_controller_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::Trends::LinksController do
- render_views
-
- let(:user) { Fabricate(:admin_user) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #index' do
- it 'returns http success' do
- get :index
-
- expect(response).to have_http_status(:success)
- end
- end
-end
diff --git a/spec/controllers/admin/trends/statuses_controller_spec.rb b/spec/controllers/admin/trends/statuses_controller_spec.rb
deleted file mode 100644
index 6570340b2d..0000000000
--- a/spec/controllers/admin/trends/statuses_controller_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::Trends::StatusesController do
- render_views
-
- let(:user) { Fabricate(:admin_user) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #index' do
- it 'returns http success' do
- get :index
-
- expect(response).to have_http_status(:success)
- end
- end
-end
diff --git a/spec/controllers/admin/trends/tags_controller_spec.rb b/spec/controllers/admin/trends/tags_controller_spec.rb
deleted file mode 100644
index 83ea23ed21..0000000000
--- a/spec/controllers/admin/trends/tags_controller_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::Trends::TagsController do
- render_views
-
- let(:user) { Fabricate(:admin_user) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #index' do
- it 'returns http success' do
- get :index
-
- expect(response).to have_http_status(:success)
- end
- end
-end
diff --git a/spec/requests/api/v1/media_spec.rb b/spec/requests/api/v1/media_spec.rb
index d7d0b92f11..4d6e250207 100644
--- a/spec/requests/api/v1/media_spec.rb
+++ b/spec/requests/api/v1/media_spec.rb
@@ -193,4 +193,57 @@ RSpec.describe 'Media' do
end
end
end
+
+ describe 'DELETE /api/v1/media/:id' do
+ subject do
+ delete "/api/v1/media/#{media.id}", headers: headers
+ end
+
+ context 'when media is not attached to a status' do
+ let(:media) { Fabricate(:media_attachment, account: user.account, status: nil) }
+
+ it 'returns http empty response' do
+ subject
+
+ expect(response).to have_http_status(200)
+ expect(response.content_type)
+ .to start_with('application/json')
+
+ expect(MediaAttachment.where(id: media.id)).to_not exist
+ end
+ end
+
+ context 'when media is attached to a status' do
+ let(:media) { Fabricate(:media_attachment, account: user.account, status: Fabricate.build(:status)) }
+
+ it 'returns http unprocessable entity' do
+ subject
+
+ expect(response).to have_http_status(422)
+ expect(response.content_type)
+ .to start_with('application/json')
+ expect(response.parsed_body).to match(
+ a_hash_including(
+ error: 'Media attachment is currently used by a status'
+ )
+ )
+
+ expect(MediaAttachment.where(id: media.id)).to exist
+ end
+ end
+
+ context 'when the media belongs to somebody else' do
+ let(:media) { Fabricate(:media_attachment, status: nil) }
+
+ it 'returns http not found' do
+ subject
+
+ expect(response).to have_http_status(404)
+ expect(response.content_type)
+ .to start_with('application/json')
+
+ expect(MediaAttachment.where(id: media.id)).to exist
+ end
+ end
+ end
end
diff --git a/spec/requests/api/v1/statuses_spec.rb b/spec/requests/api/v1/statuses_spec.rb
index ddf5945d25..285fa93655 100644
--- a/spec/requests/api/v1/statuses_spec.rb
+++ b/spec/requests/api/v1/statuses_spec.rb
@@ -257,13 +257,30 @@ RSpec.describe '/api/v1/statuses' do
it_behaves_like 'forbidden for wrong scope', 'read read:statuses'
- it 'removes the status', :aggregate_failures do
+ it 'discards the status and schedules removal as a redraft', :aggregate_failures do
subject
expect(response).to have_http_status(200)
expect(response.content_type)
.to start_with('application/json')
expect(Status.find_by(id: status.id)).to be_nil
+ expect(RemovalWorker).to have_enqueued_sidekiq_job(status.id, { 'redraft' => true })
+ end
+
+ context 'when called with truthy delete_media' do
+ subject do
+ delete "/api/v1/statuses/#{status.id}?delete_media=true", headers: headers
+ end
+
+ it 'discards the status and schedules removal without the redraft flag', :aggregate_failures do
+ subject
+
+ expect(response).to have_http_status(200)
+ expect(response.content_type)
+ .to start_with('application/json')
+ expect(Status.find_by(id: status.id)).to be_nil
+ expect(RemovalWorker).to have_enqueued_sidekiq_job(status.id, { 'redraft' => false })
+ end
end
end
diff --git a/spec/requests/status_show_page_spec.rb b/spec/requests/status_show_page_spec.rb
new file mode 100644
index 0000000000..758f9dcfd8
--- /dev/null
+++ b/spec/requests/status_show_page_spec.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Statuses' do
+ describe 'GET /@:account_username/:id' do
+ include AccountsHelper
+
+ def site_hostname
+ Rails.configuration.x.web_domain || Rails.configuration.x.local_domain
+ end
+
+ it 'has valid opengraph tags' do
+ account = Fabricate(:account, username: 'alice', display_name: 'Alice')
+ status = Fabricate(:status, account: account, text: 'Hello World')
+
+ get "/@#{account.username}/#{status.id}"
+
+ expect(head_link_icons.size).to eq(3) # Three favicons with sizes
+
+ expect(head_meta_content('og:title')).to match "#{display_name(account)} (#{acct(account)})"
+ expect(head_meta_content('og:type')).to eq 'article'
+ expect(head_meta_content('og:published_time')).to eq status.created_at.iso8601
+ expect(head_meta_content('og:url')).to eq short_account_status_url(account_username: account.username, id: status.id)
+ expect(head_meta_exists('og:locale')).to be false
+ end
+
+ it 'has og:locale opengraph tag if the status has is written in a given language' do
+ status_text = "Una prova d'estatus català"
+ account = Fabricate(:account, username: 'alice', display_name: 'Alice')
+ status = Fabricate(:status, account: account, text: status_text, language: 'ca')
+
+ get "/@#{account.username}/#{status.id}"
+
+ expect(head_meta_content('og:title')).to match "#{display_name(account)} (#{acct(account)})"
+ expect(head_meta_content('og:type')).to eq 'article'
+ expect(head_meta_content('og:published_time')).to eq status.created_at.iso8601
+ expect(head_meta_content('og:url')).to eq short_account_status_url(account_username: account.username, id: status.id)
+
+ expect(head_meta_exists('og:locale')).to be true
+ expect(head_meta_content('og:locale')).to eq 'ca'
+ expect(head_meta_content('og:description')).to eq status_text
+ end
+
+ def head_link_icons
+ response
+ .parsed_body
+ .search('html head link[rel=icon]')
+ end
+
+ def head_meta_content(property)
+ response
+ .parsed_body
+ .search("html head meta[property='#{property}']")
+ .attr('content')
+ .text
+ end
+
+ def head_meta_exists(property)
+ !response
+ .parsed_body
+ .search("html head meta[property='#{property}']")
+ .empty?
+ end
+ end
+end
diff --git a/spec/system/admin/relationships_spec.rb b/spec/system/admin/relationships_spec.rb
new file mode 100644
index 0000000000..2d64857c48
--- /dev/null
+++ b/spec/system/admin/relationships_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Relationships' do
+ before { sign_in(admin_user) }
+
+ describe 'Viewing account relationships page' do
+ let(:account) { Fabricate(:account) }
+
+ it 'shows page with relationships for account' do
+ visit admin_account_relationships_path(account.id)
+
+ expect(page)
+ .to have_title(I18n.t('admin.relationships.title', acct: account.pretty_acct))
+ end
+ end
+end
diff --git a/spec/system/admin/trends/links/preview_card_providers_spec.rb b/spec/system/admin/trends/links/preview_card_providers_spec.rb
index 159a5b720a..4636ca86b2 100644
--- a/spec/system/admin/trends/links/preview_card_providers_spec.rb
+++ b/spec/system/admin/trends/links/preview_card_providers_spec.rb
@@ -11,6 +11,8 @@ RSpec.describe 'Admin::Trends::Links::PreviewCardProviders' do
context 'without selecting any records' do
it 'displays a notice about selection' do
visit admin_trends_links_preview_card_providers_path
+ expect(page)
+ .to have_title(I18n.t('admin.trends.preview_card_providers.title'))
click_on button_for_allow
diff --git a/spec/system/admin/trends/links_spec.rb b/spec/system/admin/trends/links_spec.rb
index 879bbe8ad9..6140ea8154 100644
--- a/spec/system/admin/trends/links_spec.rb
+++ b/spec/system/admin/trends/links_spec.rb
@@ -11,6 +11,8 @@ RSpec.describe 'Admin::Trends::Links' do
context 'without selecting any records' do
it 'displays a notice about selection' do
visit admin_trends_links_path
+ expect(page)
+ .to have_title(I18n.t('admin.trends.links.title'))
click_on button_for_allow
diff --git a/spec/system/admin/trends/statuses_spec.rb b/spec/system/admin/trends/statuses_spec.rb
index be081df989..6e1aa17b7d 100644
--- a/spec/system/admin/trends/statuses_spec.rb
+++ b/spec/system/admin/trends/statuses_spec.rb
@@ -11,6 +11,8 @@ RSpec.describe 'Admin::Trends::Statuses' do
context 'without selecting any records' do
it 'displays a notice about selection' do
visit admin_trends_statuses_path
+ expect(page)
+ .to have_title(I18n.t('admin.trends.statuses.title'))
click_on button_for_allow
diff --git a/spec/system/admin/trends/tags_spec.rb b/spec/system/admin/trends/tags_spec.rb
index a71d9ba8ca..a7f00c0232 100644
--- a/spec/system/admin/trends/tags_spec.rb
+++ b/spec/system/admin/trends/tags_spec.rb
@@ -11,6 +11,8 @@ RSpec.describe 'Admin::Trends::Tags' do
context 'without selecting any records' do
it 'displays a notice about selection' do
visit admin_trends_tags_path
+ expect(page)
+ .to have_title(I18n.t('admin.trends.tags.title'))
click_on button_for_allow
diff --git a/yarn.lock b/yarn.lock
index 0f1dd037d9..ec2f55f18a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3910,9 +3910,9 @@ __metadata:
linkType: hard
"@types/lodash@npm:^4.14.195":
- version: 4.17.15
- resolution: "@types/lodash@npm:4.17.15"
- checksum: 10c0/2eb2dc6d231f5fb4603d176c08c8d7af688f574d09af47466a179cd7812d9f64144ba74bb32ca014570ffdc544eedc51b7a5657212bad083b6eecbd72223f9bb
+ version: 4.17.16
+ resolution: "@types/lodash@npm:4.17.16"
+ checksum: 10c0/cf017901b8ab1d7aabc86d5189d9288f4f99f19a75caf020c0e2c77b8d4cead4db0d0b842d009b029339f92399f49f34377dd7c2721053388f251778b4c23534
languageName: node
linkType: hard
+
+
+
+ ),
+ }}
+ />
+
+
+
+
+
+
+
+