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

Merge branch 'invalid-chats' into 'develop'

Browse source 
Filter out invalid chats, fixes #648

Closes #648

See merge request soapbox-pub/soapbox-fe!517
This commit is contained in:
Alex Gleason 2021-06-01 01:18:07 +00:00
commit 1acfc31280
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/soapbox/features/chats/components/chat_panes.js
View file

@ -12,14 +12,16 @@ import { openChat, toggleMainWindow } from 'soapbox/actions/chats';
import ChatWindow from './chat_window'; import ChatWindow from './chat_window';
import { shortNumberFormat } from 'soapbox/utils/numbers'; import { shortNumberFormat } from 'soapbox/utils/numbers';
import AudioToggle from 'soapbox/features/chats/components/audio_toggle'; import AudioToggle from 'soapbox/features/chats/components/audio_toggle';
import { List as ImmutableList } from 'immutable';
const addChatsToPanes = (state, panesData) => { const addChatsToPanes = (state, panesData) => {
const getChat = makeGetChat(); const getChat = makeGetChat();
const newPanes = panesData.get('panes').map(pane => { const newPanes = panesData.get('panes').reduce((acc, pane) => {
const chat = getChat(state, { id: pane.get('chat_id') }); const chat = getChat(state, { id: pane.get('chat_id') });
return pane.set('chat', chat); if (!chat) return acc;
}); return acc.push(pane.set('chat', chat));
}, ImmutableList());
return panesData.set('panes', newPanes); return panesData.set('panes', newPanes);
}; };