improve mod channel updating

DisStreamChat · Aug 19, 2020 · ddd089e · ddd089e
1 parent 381b7a4
commit ddd089e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/components/Channels.js b/src/components/Channels.js
@@ -157,15 +157,8 @@ const Channels = React.memo(props => {
 
 	useEffect(() => {
 		(async () => {
-			const channelsInfo = await Promise.all(
-				userData.ModChannels?.map?.(async channel => {
-					const apiUrl = `${process.env.REACT_APP_SOCKET_URL}/resolveuser?user=${channel.id}&platform=twitch`;
-					const response = await fetch(apiUrl);
-					return response.json();
-				}) || []
-			);
 			setModChannels(
-				channelsInfo
+				userData.modChannels
 					?.sort((a, b) => a.login.localeCompare(b.login))
 					?.map(channel => {
 						return { ...channel, modPlatform: "twitch", uid: sha1(channel.id) };

diff --git a/src/index.js b/src/index.js
@@ -77,9 +77,13 @@ const App = () => {
 				const removedChannels = userData.removedChannels || [];
                 const NewModChannels = (await modChannelResponse.json()).filter(channel => !removedChannels.includes(channel.id));
 
-				const ModChannels = [...NewModChannels, ...(userData.ModChannels || [])].filter(
+				const ModChannels = await Promise.all([...NewModChannels, ...(userData.ModChannels || [])].filter(
 					(thing, index, self) => index === self.findIndex(t => t.id === thing.id)
-				);
+				).map(async channel => {
+					const apiUrl = `${process.env.REACT_APP_SOCKET_URL}/resolveuser?user=${channel.id}&platform=twitch`;
+					const response = await fetch(apiUrl);
+					return response.json();
+				}));
 				firebase.db.collection("Streamers").doc(currentUser.uid).update({
 					profilePicture,
                     ModChannels,