From 57d44889f2023f646e31200eafcb88ba8cccc1c2 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 28 Mar 2020 13:07:36 -0500
Subject: [PATCH] Handle acct_full on the frontend

---
 app/gabsocial/components/display_name.js         |  3 ++-
 .../features/ui/components/profile_info_panel.js |  3 ++-
 .../features/ui/components/user_panel.js         |  3 ++-
 app/gabsocial/utils/accounts.js                  | 16 ++++++++++++++++
 public/index.html                                |  2 +-
 5 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 app/gabsocial/utils/accounts.js

diff --git a/app/gabsocial/components/display_name.js b/app/gabsocial/components/display_name.js
index e9f91f725..be0614140 100644
--- a/app/gabsocial/components/display_name.js
+++ b/app/gabsocial/components/display_name.js
@@ -2,6 +2,7 @@ import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import VerificationBadge from './verification_badge';
+import { acctFull } from '../utils/accounts';
 
 export default class DisplayName extends React.PureComponent {
 
@@ -40,7 +41,7 @@ export default class DisplayName extends React.PureComponent {
           {account.get('is_verified') && <VerificationBadge />}
         </>
       );
-      suffix = <span className='display-name__account'>@{account.get('acct_full')}</span>;
+      suffix = <span className='display-name__account'>@{acctFull(account)}</span>;
     }
 
     return (
diff --git a/app/gabsocial/features/ui/components/profile_info_panel.js b/app/gabsocial/features/ui/components/profile_info_panel.js
index 5078717c5..1862e06fc 100644
--- a/app/gabsocial/features/ui/components/profile_info_panel.js
+++ b/app/gabsocial/features/ui/components/profile_info_panel.js
@@ -14,6 +14,7 @@ import ProBadge from 'gabsocial/components/pro_badge';
 import DonorBadge from 'gabsocial/components/donor_badge';
 import InvestorBadge from 'gabsocial/components/investor_badge';
 import { List as ImmutableList } from 'immutable';
+import { acctFull } from 'gabsocial/utils/accounts';
 
 const messages = defineMessages({
   linkVerifiedOn: { id: 'account.link_verified_on', defaultMessage: 'Ownership of this link was checked on {date}' },
@@ -73,7 +74,7 @@ class ProfileInfoPanel extends ImmutablePureComponent {
               <span dangerouslySetInnerHTML={displayNameHtml} />
                 {account.get('is_verified') && <VerificationBadge />}
                 {badge}
-              <small>@{account.get('acct_full')} {lockedIcon}</small>
+              <small>@{acctFull(account)} {lockedIcon}</small>
             </h1>
           </div>
 
diff --git a/app/gabsocial/features/ui/components/user_panel.js b/app/gabsocial/features/ui/components/user_panel.js
index 9b33ad7fa..60832103a 100644
--- a/app/gabsocial/features/ui/components/user_panel.js
+++ b/app/gabsocial/features/ui/components/user_panel.js
@@ -9,6 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Avatar from 'gabsocial/components/avatar';
 import { shortNumberFormat } from 'gabsocial/utils/numbers';
+import { acctFull } from 'gabsocial/utils/accounts';
 
 class UserPanel extends ImmutablePureComponent {
   static propTypes = {
@@ -42,7 +43,7 @@ class UserPanel extends ImmutablePureComponent {
               <h1>
                 <Link to={`/@${account.get('acct')}`}>
                   <span className='user-panel__account__name' dangerouslySetInnerHTML={displayNameHtml} />
-                  <small className='user-panel__account__username'>@{account.get('acct_full')}</small>
+                  <small className='user-panel__account__username'>@{acctFull(account)}</small>
                 </Link>
               </h1>
             </div>
diff --git a/app/gabsocial/utils/accounts.js b/app/gabsocial/utils/accounts.js
new file mode 100644
index 000000000..938475582
--- /dev/null
+++ b/app/gabsocial/utils/accounts.js
@@ -0,0 +1,16 @@
+const getDomain = account => {
+  let re = /https?:\/\/(.*?)\//i;
+  return re.exec(account.get('url'))[1];
+}
+
+// user@domain even for local users
+export const acctFull = account => {
+  let [user, domain] = account.get('acct').split('@');
+  try {
+    if (!domain) domain = getDomain(account);
+  } catch(e) {
+    console.error('Could not get domain for acctFull.');
+    return account.get('acct');
+  }
+  return [user, domain].join('@');
+}
diff --git a/public/index.html b/public/index.html
index e46b48652..f63671fdb 100644
--- a/public/index.html
+++ b/public/index.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="/packs/css/lime.chunk.css">
     <script src="/packs/js/common.js"></script>
     <script src="/packs/js/locale_en.chunk.js"></script>
-    <script id="initial-state" type="application/json">{"meta":{"streaming_api_base_url":"wss://gleasonator.com","access_token":"XXXX","locale":"en","domain":"localhost:3035","admin":"1","search_enabled":false,"repository":"soapbox-pub/soapbox","source_url":"https://gitlab.com/soapbox-pub/soapbox","version":"1.0.0rc1","invites_enabled":false,"logo":"https://media.gleasonator.com/site_uploads/files/000/000/002/original/logo.svg","mask_icon":"https://media.gleasonator.com/site_uploads/files/000/000/004/original/gleasonator.svg","profile_directory":false,"funding":{"amount":2500,"patrons":2,"currency":"usd","interval":"month","goal":{"amount":"4500","text":"Operating expenses including monthly server costs, media storage, and email notifications."}},"promo_items":[{"icon":"area-chart","text":"Gleasonator stats","url":"https://fediverse.network/gleasonator.com"},{"icon":"music","text":"Gleasonator theme song","url":"https://media.gleasonator.com/custom/261905_gleasonator_song.mp3"}],"site_title":"Gleasonator","username":"alex","me":"1","unfollow_modal":false,"boost_modal":false,"delete_modal":true,"auto_play_gif":false,"display_media":"default","expand_spoilers":false,"reduce_motion":false,"advanced_layout":false,"group_in_home_feed":null,"is_staff":true,"unread_count":0},"compose":{"me":"1","default_privacy":"public","default_sensitive":false},"accounts":{"1":{"id":"1","username":"alex","acct":"alex","acct_full":"alex@gleasonator.com","display_name":"Alex Gleason","locked":false,"bot":false,"created_at":"2020-01-08T01:25:43.943Z","is_moderator":false,"is_admin":true,"note":"\u003cp\u003eFediverse developer. I believe in nonviolence. \u003ca href=\"https://gleasonator.com/tags/vegan\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003evegan\u003c/span\u003e\u003c/a\u003e \u003ca href=\"https://gleasonator.com/tags/freeculture\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003efreeculture\u003c/span\u003e\u003c/a\u003e \u003ca href=\"https://gleasonator.com/tags/atheist\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003eatheist\u003c/span\u003e\u003c/a\u003e \u003ca href=\"https://gleasonator.com/tags/antiporn\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003eantiporn\u003c/span\u003e\u003c/a\u003e \u003ca href=\"https://gleasonator.com/tags/gendercritical\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003egendercritical\u003c/span\u003e\u003c/a\u003e. Avatar by Nina Paley (\u003cspan class=\"h-card\"\u003e\u003ca href=\"https://neenster.org/@nina\" class=\"u-url mention\"\u003e@\u003cspan\u003enina\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e). Boosts ≠ endorsements.\u003c/p\u003e","url":"https://gleasonator.com/@alex","avatar":"https://media.gleasonator.com/accounts/avatars/000/000/001/original/b21db23d54442878.png","avatar_static":"https://media.gleasonator.com/accounts/avatars/000/000/001/original/b21db23d54442878.png","header":"https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png","header_static":"https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png","followers_count":325,"following_count":781,"statuses_count":2266,"is_pro":false,"is_verified":false,"is_donor":false,"is_investor":false,"customizations":{"background":null},"emojis":[],"fields":[{"name":"Website","value":"\u003ca href=\"https://alexgleason.me\" rel=\"me nofollow noopener\" target=\"_blank\"\u003e\u003cspan class=\"invisible\"\u003ehttps://\u003c/span\u003e\u003cspan class=\"\"\u003ealexgleason.me\u003c/span\u003e\u003cspan class=\"invisible\"\u003e\u003c/span\u003e\u003c/a\u003e","verified_at":"2020-01-09T03:26:54.760+00:00"},{"name":"Mastodon+Soapbox","value":"\u003ca href=\"https://soapbox.pub\" rel=\"me nofollow noopener\" target=\"_blank\"\u003e\u003cspan class=\"invisible\"\u003ehttps://\u003c/span\u003e\u003cspan class=\"\"\u003esoapbox.pub\u003c/span\u003e\u003cspan class=\"invisible\"\u003e\u003c/span\u003e\u003c/a\u003e","verified_at":null},{"name":"Email","value":"alex@alexgleason.me","verified_at":null},{"name":"Gender identity","value":"\u003ca href=\"https://4w.pub/im-not-trans-but-im-definitely-not-cis/\" rel=\"me nofollow noopener\" target=\"_blank\"\u003e\u003cspan class=\"invisible\"\u003ehttps://\u003c/span\u003e\u003cspan class=\"ellipsis\"\u003e4w.pub/im-not-trans-but-im-def\u003c/span\u003e\u003cspan class=\"invisible\"\u003einitely-not-cis/\u003c/span\u003e\u003c/a\u003e","verified_at":null}]}},"media_attachments":{"accept_content_types":[".jpg",".jpeg",".png",".gif",".webp",".webm",".mp4",".m4v",".mov","image/jpeg","image/png","image/gif","image/webp","video/webm","video/mp4","video/quicktime"]},"settings":{"frequentlyUsedEmojis":{"laughing":2,"flushed":1,"grinning":3,"slightly_frowning_face":1,"+1":2,"slightly_smiling_face":6,"dark_sunglasses":1,"smile":3,"tada":1,"thinking_face":4,"grin":1,"smiley":38,"joy":2,"man-shrugging":1,"clap":3,"stuck_out_tongue":2,"popcorn":2,"tm":4,"wave":5,"radioactive_sign":1,"warning":1,"sweat_smile":2,"smile_cat":1},"onboarded":false,"notifications":{"alerts":{"follow":true,"favourite":true,"reblog":true,"mention":true,"poll":true},"quickFilter":{"active":"all","show":true,"advanced":false},"shows":{"follow":true,"favourite":true,"reblog":true,"mention":true,"poll":true},"sounds":{"follow":true,"favourite":true,"reblog":true,"mention":true,"poll":true}},"public":{"other":{"onlyMedia":false},"regex":{"body":""}},"direct":{"regex":{"body":""}},"community":{"other":{"onlyMedia":false},"regex":{"body":""}},"skinTone":1,"trends":{"show":true},"columns":[{"id":"COMPOSE","uuid":"dee15b64-895c-4f7d-a46e-dfc7bbe72c13","params":{}},{"id":"HOME","uuid":"d502a858-a691-4afd-886e-04d0c8220e0b","params":{}},{"id":"NOTIFICATIONS","uuid":"01d1782d-b398-41c7-9959-6de84867b53a","params":{}}],"home":{"shows":{"reblog":true,"reply":true},"regex":{"body":""}}},"max_toot_chars":3000,"push_subscription":null}</script>
+    <script id="initial-state" type="application/json">{"meta":{"streaming_api_base_url":"wss://gleasonator.com","access_token":"XXXX","locale":"en","domain":"localhost:3035","admin":"1","search_enabled":false,"repository":"soapbox-pub/soapbox","source_url":"https://gitlab.com/soapbox-pub/soapbox","version":"1.0.0rc1","invites_enabled":false,"logo":"https://media.gleasonator.com/site_uploads/files/000/000/002/original/logo.svg","mask_icon":"https://media.gleasonator.com/site_uploads/files/000/000/004/original/gleasonator.svg","profile_directory":false,"funding":{"amount":2500,"patrons":2,"currency":"usd","interval":"month","goal":{"amount":"4500","text":"Operating expenses including monthly server costs, media storage, and email notifications."}},"promo_items":[{"icon":"area-chart","text":"Gleasonator stats","url":"https://fediverse.network/gleasonator.com"},{"icon":"music","text":"Gleasonator theme song","url":"https://media.gleasonator.com/custom/261905_gleasonator_song.mp3"}],"site_title":"Gleasonator","username":"alex","me":"1","unfollow_modal":false,"boost_modal":false,"delete_modal":true,"auto_play_gif":false,"display_media":"default","expand_spoilers":false,"reduce_motion":false,"advanced_layout":false,"group_in_home_feed":null,"is_staff":true,"unread_count":0},"compose":{"me":"1","default_privacy":"public","default_sensitive":false},"accounts":{"1":{"id":"1","username":"alex","acct":"alex","display_name":"Alex Gleason","locked":false,"bot":false,"created_at":"2020-01-08T01:25:43.943Z","is_moderator":false,"is_admin":true,"note":"\u003cp\u003eFediverse developer. I believe in nonviolence. \u003ca href=\"https://gleasonator.com/tags/vegan\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003evegan\u003c/span\u003e\u003c/a\u003e \u003ca href=\"https://gleasonator.com/tags/freeculture\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003efreeculture\u003c/span\u003e\u003c/a\u003e \u003ca href=\"https://gleasonator.com/tags/atheist\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003eatheist\u003c/span\u003e\u003c/a\u003e \u003ca href=\"https://gleasonator.com/tags/antiporn\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003eantiporn\u003c/span\u003e\u003c/a\u003e \u003ca href=\"https://gleasonator.com/tags/gendercritical\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003egendercritical\u003c/span\u003e\u003c/a\u003e. Avatar by Nina Paley (\u003cspan class=\"h-card\"\u003e\u003ca href=\"https://neenster.org/@nina\" class=\"u-url mention\"\u003e@\u003cspan\u003enina\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e). Boosts ≠ endorsements.\u003c/p\u003e","url":"https://gleasonator.com/@alex","avatar":"https://media.gleasonator.com/accounts/avatars/000/000/001/original/b21db23d54442878.png","avatar_static":"https://media.gleasonator.com/accounts/avatars/000/000/001/original/b21db23d54442878.png","header":"https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png","header_static":"https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png","followers_count":325,"following_count":781,"statuses_count":2266,"is_pro":false,"is_verified":false,"is_donor":false,"is_investor":false,"customizations":{"background":null},"emojis":[],"fields":[{"name":"Website","value":"\u003ca href=\"https://alexgleason.me\" rel=\"me nofollow noopener\" target=\"_blank\"\u003e\u003cspan class=\"invisible\"\u003ehttps://\u003c/span\u003e\u003cspan class=\"\"\u003ealexgleason.me\u003c/span\u003e\u003cspan class=\"invisible\"\u003e\u003c/span\u003e\u003c/a\u003e","verified_at":"2020-01-09T03:26:54.760+00:00"},{"name":"Mastodon+Soapbox","value":"\u003ca href=\"https://soapbox.pub\" rel=\"me nofollow noopener\" target=\"_blank\"\u003e\u003cspan class=\"invisible\"\u003ehttps://\u003c/span\u003e\u003cspan class=\"\"\u003esoapbox.pub\u003c/span\u003e\u003cspan class=\"invisible\"\u003e\u003c/span\u003e\u003c/a\u003e","verified_at":null},{"name":"Email","value":"alex@alexgleason.me","verified_at":null},{"name":"Gender identity","value":"\u003ca href=\"https://4w.pub/im-not-trans-but-im-definitely-not-cis/\" rel=\"me nofollow noopener\" target=\"_blank\"\u003e\u003cspan class=\"invisible\"\u003ehttps://\u003c/span\u003e\u003cspan class=\"ellipsis\"\u003e4w.pub/im-not-trans-but-im-def\u003c/span\u003e\u003cspan class=\"invisible\"\u003einitely-not-cis/\u003c/span\u003e\u003c/a\u003e","verified_at":null}]}},"media_attachments":{"accept_content_types":[".jpg",".jpeg",".png",".gif",".webp",".webm",".mp4",".m4v",".mov","image/jpeg","image/png","image/gif","image/webp","video/webm","video/mp4","video/quicktime"]},"settings":{"frequentlyUsedEmojis":{"laughing":2,"flushed":1,"grinning":3,"slightly_frowning_face":1,"+1":2,"slightly_smiling_face":6,"dark_sunglasses":1,"smile":3,"tada":1,"thinking_face":4,"grin":1,"smiley":38,"joy":2,"man-shrugging":1,"clap":3,"stuck_out_tongue":2,"popcorn":2,"tm":4,"wave":5,"radioactive_sign":1,"warning":1,"sweat_smile":2,"smile_cat":1},"onboarded":false,"notifications":{"alerts":{"follow":true,"favourite":true,"reblog":true,"mention":true,"poll":true},"quickFilter":{"active":"all","show":true,"advanced":false},"shows":{"follow":true,"favourite":true,"reblog":true,"mention":true,"poll":true},"sounds":{"follow":true,"favourite":true,"reblog":true,"mention":true,"poll":true}},"public":{"other":{"onlyMedia":false},"regex":{"body":""}},"direct":{"regex":{"body":""}},"community":{"other":{"onlyMedia":false},"regex":{"body":""}},"skinTone":1,"trends":{"show":true},"columns":[{"id":"COMPOSE","uuid":"dee15b64-895c-4f7d-a46e-dfc7bbe72c13","params":{}},{"id":"HOME","uuid":"d502a858-a691-4afd-886e-04d0c8220e0b","params":{}},{"id":"NOTIFICATIONS","uuid":"01d1782d-b398-41c7-9959-6de84867b53a","params":{}}],"home":{"shows":{"reblog":true,"reply":true},"regex":{"body":""}}},"max_toot_chars":3000,"push_subscription":null}</script>
     <script src="/packs/js/application.chunk.js"></script>
   </head>
   <body class="app-body theme-lime no-reduce-motion">