diff --git a/app/soapbox/components/status_action_bar.js b/app/soapbox/components/status_action_bar.js
index 47fe89956..b58991ea3 100644
--- a/app/soapbox/components/status_action_bar.js
+++ b/app/soapbox/components/status_action_bar.js
@@ -277,6 +277,7 @@ class StatusActionBar extends ImmutablePureComponent {
_makeMenu = (publicStatus) => {
const { status, intl, withDismiss, withGroupAdmin, me, isStaff, isAdmin } = this.props;
const mutingConversation = status.get('muted');
+ const ownAccount = status.getIn(['account', 'id']) === me;
let menu = [];
@@ -295,12 +296,12 @@ class StatusActionBar extends ImmutablePureComponent {
menu.push(null);
- if (status.getIn(['account', 'id']) === me || withDismiss) {
+ if (ownAccount || withDismiss) {
menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
menu.push(null);
}
- if (status.getIn(['account', 'id']) === me) {
+ if (ownAccount) {
if (publicStatus) {
menu.push({ text: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick });
} else {
@@ -318,24 +319,29 @@ class StatusActionBar extends ImmutablePureComponent {
menu.push({ text: intl.formatMessage(messages.mute, { name: status.getIn(['account', 'username']) }), action: this.handleMuteClick });
menu.push({ text: intl.formatMessage(messages.block, { name: status.getIn(['account', 'username']) }), action: this.handleBlockClick });
menu.push({ text: intl.formatMessage(messages.report, { name: status.getIn(['account', 'username']) }), action: this.handleReport });
+ }
- if (isStaff) {
- menu.push(null);
- if (isAdmin) {
- menu.push({ text: intl.formatMessage(messages.admin_account, { name: status.getIn(['account', 'username']) }), href: `/pleroma/admin/#/users/${status.getIn(['account', 'id'])}/` });
- menu.push({ text: intl.formatMessage(messages.admin_status), href: `/pleroma/admin/#/statuses/${status.get('id')}/` });
- }
+ if (isStaff) {
+ menu.push(null);
+
+ if (isAdmin) {
+ menu.push({ text: intl.formatMessage(messages.admin_account, { name: status.getIn(['account', 'username']) }), href: `/pleroma/admin/#/users/${status.getIn(['account', 'id'])}/` });
+ menu.push({ text: intl.formatMessage(messages.admin_status), href: `/pleroma/admin/#/statuses/${status.get('id')}/` });
+ }
+
+ menu.push({ text: intl.formatMessage(status.get('sensitive') === false ? messages.markStatusSensitive : messages.markStatusNotSensitive), action: this.handleToggleStatusSensitivity });
+
+ if (!ownAccount) {
menu.push({ text: intl.formatMessage(messages.deactivateUser, { name: status.getIn(['account', 'username']) }), action: this.handleDeactivateUser });
menu.push({ text: intl.formatMessage(messages.deleteUser, { name: status.getIn(['account', 'username']) }), action: this.handleDeleteUser });
- menu.push({ text: intl.formatMessage(status.get('sensitive') === false ? messages.markStatusSensitive : messages.markStatusNotSensitive), action: this.handleToggleStatusSensitivity });
menu.push({ text: intl.formatMessage(messages.deleteStatus), action: this.handleDeleteStatus });
}
+ }
- if (withGroupAdmin) {
- menu.push(null);
- menu.push({ text: intl.formatMessage(messages.group_remove_account), action: this.handleGroupRemoveAccount });
- menu.push({ text: intl.formatMessage(messages.group_remove_post), action: this.handleGroupRemovePost });
- }
+ if (!ownAccount && withGroupAdmin) {
+ menu.push(null);
+ menu.push({ text: intl.formatMessage(messages.group_remove_account), action: this.handleGroupRemoveAccount });
+ menu.push({ text: intl.formatMessage(messages.group_remove_post), action: this.handleGroupRemovePost });
}
return menu;
diff --git a/app/soapbox/features/account/components/header.js b/app/soapbox/features/account/components/header.js
index 537990134..4bb1822d7 100644
--- a/app/soapbox/features/account/components/header.js
+++ b/app/soapbox/features/account/components/header.js
@@ -287,7 +287,7 @@ class Header extends ImmutablePureComponent {
);
}
- const self = account.get('id') === me;
+ const ownAccount = account.get('id') === me;
const info = this.makeInfo();
const menu = this.makeMenu();
@@ -324,18 +324,18 @@ class Header extends ImmutablePureComponent {
- {(self || !account.getIn(['pleroma', 'hide_follows'], false)) &&
+ {(ownAccount || !account.getIn(['pleroma', 'hide_follows'], false)) &&
{account.getIn(['pleroma', 'hide_follows_count'], false) ? • : {shortNumberFormat(account.get('following_count'))}}
}
- {(self || !account.getIn(['pleroma', 'hide_followers'], false)) &&
+ {(ownAccount || !account.getIn(['pleroma', 'hide_followers'], false)) &&
{account.getIn(['pleroma', 'hide_followers_count'], false) ? • : {shortNumberFormat(account.get('followers_count'))}}
}
{
- self &&
+ ownAccount &&