Merge branch 'mastodon-lookup-fix' into 'develop'

Mastodon: fall back to account lookup API

See merge request soapbox-pub/soapbox-fe!1021

app/soapbox/actions/accounts.js

@@ -156,14 +156,7 @@ export function fetchAccountByUsername(username) {
     const features = getFeatures(instance);
     const me = state.get('me');
 
-    if (!me && features.accountLookup) {
+    if (features.accountByUsername && (me || !features.accountLookup)) {
-      dispatch(accountLookup(username)).then(account => {
-        dispatch(fetchAccountSuccess(account));
-      }).catch(error => {
-        dispatch(fetchAccountFail(null, error));
-        dispatch(importErrorWhileFetchingAccountByUsername(username));
-      });
-    } else if (features.accountByUsername) {
       api(getState).get(`/api/v1/accounts/${username}`).then(response => {
         dispatch(fetchRelationships([response.data.id]));
         dispatch(importFetchedAccount(response.data));
@@ -172,6 +165,13 @@ export function fetchAccountByUsername(username) {
         dispatch(fetchAccountFail(null, error));
         dispatch(importErrorWhileFetchingAccountByUsername(username));
       });
+    } else if (features.accountLookup) {
+      dispatch(accountLookup(username)).then(account => {
+        dispatch(fetchAccountSuccess(account));
+      }).catch(error => {
+        dispatch(fetchAccountFail(null, error));
+        dispatch(importErrorWhileFetchingAccountByUsername(username));
+      });
     } else {
       dispatch(accountSearch({
         q: username,

app/soapbox/containers/soapbox.js

@@ -31,6 +31,14 @@ import configureStore from '../store/configureStore';
 
 const validLocale = locale => Object.keys(messages).includes(locale);
 
+// Delay rendering until instance has loaded or failed (for feature detection)
+const isInstanceLoaded = state => {
+  const v = state.getIn(['instance', 'version'], '0.0.0');
+  const fetchFailed = state.getIn(['meta', 'instance_fetch_failed'], false);
+
+  return v !== '0.0.0' || fetchFailed;
+};
+
 export const store = configureStore();
 
 // Configure global functions for developers
@@ -60,6 +68,7 @@ const mapStateToProps = (state) => {
   return {
     showIntroduction,
     me,
+    instanceLoaded: isInstanceLoaded(state),
     reduceMotion: settings.get('reduceMotion'),
     underlineLinks: settings.get('underlineLinks'),
     systemFont: settings.get('systemFont'),
@@ -80,6 +89,7 @@ class SoapboxMount extends React.PureComponent {
   static propTypes = {
     showIntroduction: PropTypes.bool,
     me: SoapboxPropTypes.me,
+    instanceLoaded: PropTypes.bool,
     reduceMotion: PropTypes.bool,
     underlineLinks: PropTypes.bool,
     systemFont: PropTypes.bool,
@@ -124,8 +134,9 @@ class SoapboxMount extends React.PureComponent {
   }
 
   render() {
-    const { me, themeCss, locale, customCss } = this.props;
+    const { me, instanceLoaded, themeCss, locale, customCss } = this.props;
     if (me === null) return null;
+    if (!instanceLoaded) return null;
     if (this.state.localeLoading) return null;
 
     // Disabling introduction for launch