[Glitch] Fix media, following and followers tabs in web UI
Port 73de39e632
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
main
parent
c9d3c7d63a
commit
58e2b0973d
|
@ -2,9 +2,10 @@ import React from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import FeaturedTags from 'flavours/glitch/features/account/containers/featured_tags_container';
|
import FeaturedTags from 'flavours/glitch/features/account/containers/featured_tags_container';
|
||||||
|
import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
|
||||||
|
|
||||||
const mapStateToProps = (state, { match: { params: { acct } } }) => {
|
const mapStateToProps = (state, { match: { params: { acct } } }) => {
|
||||||
const accountId = state.getIn(['accounts_map', acct]);
|
const accountId = state.getIn(['accounts_map', normalizeForLookup(acct)]);
|
||||||
|
|
||||||
if (!accountId) {
|
if (!accountId) {
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -15,9 +15,10 @@ import ScrollContainer from 'flavours/glitch/containers/scroll_container';
|
||||||
import LoadMore from 'flavours/glitch/components/load_more';
|
import LoadMore from 'flavours/glitch/components/load_more';
|
||||||
import MissingIndicator from 'flavours/glitch/components/missing_indicator';
|
import MissingIndicator from 'flavours/glitch/components/missing_indicator';
|
||||||
import { openModal } from 'flavours/glitch/actions/modal';
|
import { openModal } from 'flavours/glitch/actions/modal';
|
||||||
|
import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
|
||||||
|
|
||||||
const mapStateToProps = (state, { params: { acct, id } }) => {
|
const mapStateToProps = (state, { params: { acct, id } }) => {
|
||||||
const accountId = id || state.getIn(['accounts_map', acct]);
|
const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]);
|
||||||
|
|
||||||
if (!accountId) {
|
if (!accountId) {
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -21,9 +21,10 @@ import ScrollableList from 'flavours/glitch/components/scrollable_list';
|
||||||
import TimelineHint from 'flavours/glitch/components/timeline_hint';
|
import TimelineHint from 'flavours/glitch/components/timeline_hint';
|
||||||
import LimitedAccountHint from '../account_timeline/components/limited_account_hint';
|
import LimitedAccountHint from '../account_timeline/components/limited_account_hint';
|
||||||
import { getAccountHidden } from 'flavours/glitch/selectors';
|
import { getAccountHidden } from 'flavours/glitch/selectors';
|
||||||
|
import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
|
||||||
|
|
||||||
const mapStateToProps = (state, { params: { acct, id } }) => {
|
const mapStateToProps = (state, { params: { acct, id } }) => {
|
||||||
const accountId = id || state.getIn(['accounts_map', acct]);
|
const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]);
|
||||||
|
|
||||||
if (!accountId) {
|
if (!accountId) {
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -21,9 +21,10 @@ import ScrollableList from 'flavours/glitch/components/scrollable_list';
|
||||||
import TimelineHint from 'flavours/glitch/components/timeline_hint';
|
import TimelineHint from 'flavours/glitch/components/timeline_hint';
|
||||||
import LimitedAccountHint from '../account_timeline/components/limited_account_hint';
|
import LimitedAccountHint from '../account_timeline/components/limited_account_hint';
|
||||||
import { getAccountHidden } from 'flavours/glitch/selectors';
|
import { getAccountHidden } from 'flavours/glitch/selectors';
|
||||||
|
import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
|
||||||
|
|
||||||
const mapStateToProps = (state, { params: { acct, id } }) => {
|
const mapStateToProps = (state, { params: { acct, id } }) => {
|
||||||
const accountId = id || state.getIn(['accounts_map', acct]);
|
const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]);
|
||||||
|
|
||||||
if (!accountId) {
|
if (!accountId) {
|
||||||
return {
|
return {
|
||||||
|
|
Loading…
Reference in New Issue