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

Merge branch 'normal-chat-refactor' into 'develop'

Browse source 
Normalize chat in reducer, not action

See merge request soapbox-pub/soapbox-fe!1092
This commit is contained in:
Alex Gleason 2022-03-11 03:19:41 +00:00
commit e5f1fae956
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/soapbox/actions/importer/normalizer.js
View file

@ -40,13 +40,3 @@ export function normalizeAccount(account) {
return account; return account;
} }
export function normalizeChat(chat, normalOldChat) {
const normalChat = { ...chat };
const { account, last_message: lastMessage } = chat;
if (account) normalChat.account = account.id;
if (lastMessage) normalChat.last_message = lastMessage.id;
return normalChat;
}

11
app/soapbox/reducers/chats.js
View file

@ -9,9 +9,18 @@ import {
CHAT_READ_SUCCESS, CHAT_READ_SUCCESS,
CHAT_READ_REQUEST, CHAT_READ_REQUEST,
} from 'soapbox/actions/chats'; } from 'soapbox/actions/chats';
import { normalizeChat } from 'soapbox/actions/importer/normalizer';
import { STREAMING_CHAT_UPDATE } from 'soapbox/actions/streaming'; import { STREAMING_CHAT_UPDATE } from 'soapbox/actions/streaming';
const normalizeChat = (chat, normalOldChat) => {
const normalChat = { ...chat };
const { account, last_message: lastMessage } = chat;
if (account) normalChat.account = account.id;
if (lastMessage) normalChat.last_message = lastMessage.id;
return normalChat;
};
const importChat = (state, chat) => state.setIn(['items', chat.id], fromJS(normalizeChat(chat))); const importChat = (state, chat) => state.setIn(['items', chat.id], fromJS(normalizeChat(chat)));
const importChats = (state, chats, next) => const importChats = (state, chats, next) =>