Change Profile Views

atsu1125 · Oct 20, 2022 · 19f98ea · 19f98ea
1 parent ea5b6aa
commit 19f98ea
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
@@ -62,6 +62,8 @@ def minimal_account_action_button(account)
   def account_badge(account, all: false)
     if account.bot?
       content_tag(:div, content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot'), class: 'roles')
+    elsif account.cat?
+      content_tag(:div, content_tag(:div, t('accounts.roles.cat'), class: 'account-role cat'), class: 'roles')
     elsif account.group?
       content_tag(:div, content_tag(:div, t('accounts.roles.group'), class: 'account-role group'), class: 'roles')
     elsif (Setting.show_staff_badge && account.user_staff?) || all

diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js
@@ -215,6 +215,8 @@ class Header extends ImmutablePureComponent {
         menu.push(null);
       }
 
+      menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList });
+
       if (account.getIn(['relationship', 'muting'])) {
         menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.props.onMute });
       } else {
@@ -228,7 +230,6 @@ class Header extends ImmutablePureComponent {
       }
 
       menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.props.onReport });
-      menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList });
     }
 
     if (account.get('acct') !== account.get('username')) {
@@ -259,6 +260,8 @@ class Header extends ImmutablePureComponent {
       badge = (<div className='account-role bot'><FormattedMessage id='account.badges.bot' defaultMessage='Bot' /></div>);
     } else if (account.get('group')) {
       badge = (<div className='account-role group'><FormattedMessage id='account.badges.group' defaultMessage='Group' /></div>);
+    } else if (account.get('cat')) {
+      badge = (<div className='account-role cat'><FormattedMessage id='account.badges.cat' defaultMessage='Cat' /></div>);
     } else {
       badge = null;
     }

diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
@@ -212,6 +212,8 @@ class Header extends ImmutablePureComponent {
         menu.push(null);
       }
 
+      menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList });
+
       if (account.getIn(['relationship', 'muting'])) {
         menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.props.onMute });
       } else {
@@ -225,7 +227,6 @@ class Header extends ImmutablePureComponent {
       }
 
       menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.props.onReport });
-      menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList });
     }
 
     if (account.get('acct') !== account.get('username')) {
@@ -256,6 +257,8 @@ class Header extends ImmutablePureComponent {
 
     if (account.get('bot')) {
       badge = (<div className='account-role bot'><FormattedMessage id='account.badges.bot' defaultMessage='Bot' /></div>);
+    } else if (account.get('cat')) {
+      badge = (<div className='account-role cat'><FormattedMessage id='account.badges.cat' defaultMessage='Cat' /></div>);
     } else if (account.get('group')) {
       badge = (<div className='account-role group'><FormattedMessage id='account.badges.group' defaultMessage='Group' /></div>);
     } else {

diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
@@ -1022,6 +1022,10 @@
         "defaultMessage": "Bot",
         "id": "account.badges.bot"
       },
+      {
+        "defaultMessage": "Cat",
+        "id": "account.badges.cat"
+      },
       {
         "defaultMessage": "Group",
         "id": "account.badges.group"
@@ -3423,4 +3427,4 @@
     ],
     "path": "app/javascript/mastodon/features/video/index.json"
   }
-]
+]
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
@@ -2,6 +2,7 @@
   "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
+  "account.badges.cat": "Cat",
   "account.badges.group": "Group",
   "account.block": "Block @{name}",
   "account.block_domain": "Block domain {domain}",