bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'account-header-menu' into 'develop'

Browse source 
Slightly reorder account header menu items, add 'Copy link to profile'

See merge request soapbox-pub/soapbox!2514
This commit is contained in:
marcin mikołajczak 2023-05-15 07:22:02 +00:00
commit 6b39172122
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/soapbox/features/account/components/header.tsx
View file

@ -30,6 +30,7 @@ import { queryClient } from 'soapbox/queries/client';
import toast from 'soapbox/toast';
import { Account } from 'soapbox/types/entities';
import { isDefaultHeader, isLocal, isRemote } from 'soapbox/utils/accounts';
import copy from 'soapbox/utils/copy';
import { MASTODON, parseVersion } from 'soapbox/utils/features';
const messages = defineMessages({
@ -44,6 +45,7 @@ const messages = defineMessages({
unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
report: { id: 'account.report', defaultMessage: 'Report @{name}' },
copy: { id: 'status.copy', defaultMessage: 'Copy link to profile' },
share: { id: 'account.share', defaultMessage: 'Share @{name}\'s profile' },
media: { id: 'account.media', defaultMessage: 'Media' },
blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
@ -273,6 +275,10 @@ const Header: React.FC<IHeader> = ({ account }) => {
});
};
const handleCopy: React.EventHandler<React.MouseEvent> = (e) => {
copy(account.url);
};
const makeMenu = () => {
const menu: Menu = [];
@ -306,8 +312,22 @@ const Header: React.FC<IHeader> = ({ account }) => {
});
}
menu.push({
text: intl.formatMessage(messages.copy),
action: handleCopy,
icon: require('@tabler/icons/clipboard-copy.svg'),
});
if (!ownAccount) return menu;
if (features.searchFromAccount) {
menu.push({
text: intl.formatMessage(account.id === ownAccount.id ? messages.searchSelf : messages.search, { name: account.username }),
action: onSearch,
icon: require('@tabler/icons/search.svg'),
});
}
if (menu.length) {
menu.push(null);
}
@ -323,13 +343,6 @@ const Header: React.FC<IHeader> = ({ account }) => {
to: '/settings',
icon: require('@tabler/icons/settings.svg'),
});
if (features.searchFromAccount) {
menu.push({
text: intl.formatMessage(messages.searchSelf, { name: account.username }),
action: onSearch,
icon: require('@tabler/icons/search.svg'),
});
}
menu.push(null);
menu.push({
text: intl.formatMessage(messages.mutes),
@ -386,8 +399,6 @@ const Header: React.FC<IHeader> = ({ account }) => {
icon: require('@tabler/icons/user-check.svg'),
});
}
menu.push(null);
} else if (features.lists && features.unrestrictedLists) {
menu.push({
text: intl.formatMessage(messages.add_or_remove_from_list),
@ -396,13 +407,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
});
}
if (features.searchFromAccount) {
menu.push({
text: intl.formatMessage(messages.search, { name: account.username }),
action: onSearch,
icon: require('@tabler/icons/search.svg'),
});
}
menu.push(null);
if (features.removeFromFollowers && account.relationship?.followed_by) {
menu.push({