bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-crash-670' into 'develop'

Browse source 
Check URL params defensively, probably fixes #670

Closes #670

See merge request soapbox-pub/soapbox-fe!575
This commit is contained in:
Alex Gleason 2021-07-02 20:22:21 +00:00
commit a67609021b
7 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/soapbox/features/account_gallery/index.js
View file

@ -18,7 +18,8 @@ import { openModal } from 'soapbox/actions/modal';
import { NavLink } from 'react-router-dom';
import { FormattedMessage } from 'react-intl';
const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
const mapStateToProps = (state, { params, withReplies = false }) => {
const username = params.username || '';
const me = state.get('me');
const accounts = state.getIn(['accounts']);
const accountFetchError = (state.getIn(['accounts', -1, 'username'], '').toLowerCase() === username.toLowerCase());

3
app/soapbox/features/account_timeline/index.js
View file

@ -18,7 +18,8 @@ import { getSoapboxConfig } from 'soapbox/actions/soapbox';
const emptyList = ImmutableList();
const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
const mapStateToProps = (state, { params, withReplies = false }) => {
const username = params.username || '';
const me = state.get('me');
const accounts = state.getIn(['accounts']);
const accountFetchError = (state.getIn(['accounts', -1, 'username'], '').toLowerCase() === username.toLowerCase());

3
app/soapbox/features/favourited_statuses/index.js
View file

@ -10,7 +10,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { debounce } from 'lodash';
import MissingIndicator from 'soapbox/components/missing_indicator';
const mapStateToProps = (state, { params: { username } }) => {
const mapStateToProps = (state, { params }) => {
const username = params.username || '';
const me = state.get('me');
const meUsername = state.getIn(['accounts', me, 'username']);
return {

3
app/soapbox/features/followers/index.js
View file

@ -18,7 +18,8 @@ import ScrollableList from '../../components/scrollable_list';
import MissingIndicator from 'soapbox/components/missing_indicator';
import { getFollowDifference } from 'soapbox/utils/accounts';
const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
const mapStateToProps = (state, { params, withReplies = false }) => {
const username = params.username || '';
const me = state.get('me');
const accounts = state.getIn(['accounts']);
const accountFetchError = (state.getIn(['accounts', -1, 'username'], '').toLowerCase() === username.toLowerCase());

3
app/soapbox/features/following/index.js
View file

@ -18,7 +18,8 @@ import ScrollableList from '../../components/scrollable_list';
import MissingIndicator from 'soapbox/components/missing_indicator';
import { getFollowDifference } from 'soapbox/utils/accounts';
const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
const mapStateToProps = (state, { params, withReplies = false }) => {
const username = params.username || '';
const me = state.get('me');
const accounts = state.getIn(['accounts']);
const accountFetchError = (state.getIn(['accounts', -1, 'username'], '').toLowerCase() === username.toLowerCase());

3
app/soapbox/features/pinned_statuses/index.js
View file

@ -9,7 +9,8 @@ import { injectIntl, FormattedMessage } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import MissingIndicator from 'soapbox/components/missing_indicator';
const mapStateToProps = (state, { params: { username } }) => {
const mapStateToProps = (state, { params }) => {
const username = params.username || '';
const me = state.get('me');
const meUsername = state.getIn(['accounts', me, 'username']);
return {

3
app/soapbox/pages/profile_page.js
View file

@ -16,7 +16,8 @@ import { getFeatures } from 'soapbox/utils/features';
import { makeGetAccount } from '../selectors';
import { Redirect } from 'react-router-dom';
const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
const mapStateToProps = (state, { params, withReplies = false }) => {
const username = params.username || '';
const accounts = state.getIn(['accounts']);
const accountFetchError = (state.getIn(['accounts', -1, 'username'], '').toLowerCase() === username.toLowerCase());
const getAccount = makeGetAccount();