cha0s/reddichat-flat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: hydrate friend channels

Browse Source
This commit is contained in:
cha0s 2020-07-25 10:46:15 -05:00
parent 414793f5eb
commit ba5e3c71a6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/entry.js
View File

@ -53,10 +53,19 @@ export const channelState = async (req, channel) => {
};
};
const userFriendships = async (req) => (req.user ? req.user.friendship() : []);
export const channelsToHydrate = async (req) => {
const {User} = allModels();
const channels = await Promise.all(
(req.channel ? [req.channel] : [])
.concat(req.user ? await req.user.favorites() : []),
.concat(req.user ? await req.user.favorites() : [])
.concat(await Promise.all((await userFriendships(req)).map(
async ({adderId, addeeId}) => ({
type: 'u',
name: (await User.findByPk(adderId !== req.userId ? adderId : addeeId)).redditUsername,
}),
))),
);
const channelStrings = channels.map(joinChannel);
const uniqueChannels = (new Set(channelStrings)).values();
@ -65,8 +74,6 @@ export const channelsToHydrate = async (req) => {
const userBlocks = async (req) => (req.user ? req.user.blocks() : []);
const userFriendships = async (req) => (req.user ? req.user.friendship() : []);
const userState = async (req) => {
const {channel, user} = req;
if (!user) {