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

Merge branch 'external-status' into 'develop'

Browse source 
StatusActionBar: include a link to the remote status in the 3-dots menu

See merge request soapbox-pub/soapbox!1941
This commit is contained in:
Alex Gleason 2022-11-25 23:00:32 +00:00
commit 09f5ba28e5
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/soapbox/components/status-action-bar.tsx
View file

@ -18,7 +18,7 @@ import StatusActionButton from 'soapbox/components/status-action-button';
import { HStack } from 'soapbox/components/ui'; import { HStack } from 'soapbox/components/ui';
import DropdownMenuContainer from 'soapbox/containers/dropdown-menu-container'; import DropdownMenuContainer from 'soapbox/containers/dropdown-menu-container';
import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount, useSettings, useSoapboxConfig } from 'soapbox/hooks'; import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount, useSettings, useSoapboxConfig } from 'soapbox/hooks';
import { isLocal } from 'soapbox/utils/accounts'; import { isLocal, isRemote } from 'soapbox/utils/accounts';
import { getReactForStatus, reduceEmoji } from 'soapbox/utils/emoji-reacts'; import { getReactForStatus, reduceEmoji } from 'soapbox/utils/emoji-reacts';
import type { Menu } from 'soapbox/components/dropdown-menu'; import type { Menu } from 'soapbox/components/dropdown-menu';
@ -56,6 +56,7 @@ const messages = defineMessages({
copy: { id: 'status.copy', defaultMessage: 'Copy link to post' }, copy: { id: 'status.copy', defaultMessage: 'Copy link to post' },
group_remove_account: { id: 'status.remove_account_from_group', defaultMessage: 'Remove account from group' }, group_remove_account: { id: 'status.remove_account_from_group', defaultMessage: 'Remove account from group' },
group_remove_post: { id: 'status.remove_post_from_group', defaultMessage: 'Remove post from group' }, group_remove_post: { id: 'status.remove_post_from_group', defaultMessage: 'Remove post from group' },
external: { id: 'status.external', defaultMessage: 'View post on {domain}' },
deactivateUser: { id: 'admin.users.actions.deactivate_user', defaultMessage: 'Deactivate @{name}' }, deactivateUser: { id: 'admin.users.actions.deactivate_user', defaultMessage: 'Deactivate @{name}' },
deleteUser: { id: 'admin.users.actions.delete_user', defaultMessage: 'Delete @{name}' }, deleteUser: { id: 'admin.users.actions.delete_user', defaultMessage: 'Delete @{name}' },
deleteStatus: { id: 'admin.statuses.actions.delete_status', defaultMessage: 'Delete post' }, deleteStatus: { id: 'admin.statuses.actions.delete_status', defaultMessage: 'Delete post' },
@ -150,6 +151,10 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
dispatch(toggleBookmark(status)); dispatch(toggleBookmark(status));
}; };
const handleExternalClick = () => {
window.open(status.uri, '_blank');
};
const handleReblogClick: React.EventHandler<React.MouseEvent> = e => { const handleReblogClick: React.EventHandler<React.MouseEvent> = e => {
if (me) { if (me) {
const modalReblog = () => dispatch(toggleReblog(status)); const modalReblog = () => dispatch(toggleReblog(status));
@ -294,6 +299,8 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
const mutingConversation = status.muted; const mutingConversation = status.muted;
const ownAccount = status.getIn(['account', 'id']) === me; const ownAccount = status.getIn(['account', 'id']) === me;
const username = String(status.getIn(['account', 'username'])); const username = String(status.getIn(['account', 'username']));
const account = status.account as Account;
const domain = account.fqn.split('@')[1];
const menu: Menu = []; const menu: Menu = [];
@ -312,7 +319,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
icon: require('@tabler/icons/link.svg'), icon: require('@tabler/icons/link.svg'),
}); });
if (features.embeds && isLocal(status.account as Account)) { if (features.embeds && isLocal(account)) {
menu.push({ menu.push({
text: intl.formatMessage(messages.embed), text: intl.formatMessage(messages.embed),
action: handleEmbed, action: handleEmbed,
@ -333,6 +340,14 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
}); });
} }
if (features.federating && isRemote(account)) {
menu.push({
text: intl.formatMessage(messages.external, { domain }),
action: handleExternalClick,
icon: require('@tabler/icons/external-link.svg'),
});
}
menu.push(null); menu.push(null);
if (ownAccount || withDismiss) { if (ownAccount || withDismiss) {