Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions packages/react/src/hooks/useFetchChatData.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import {

const useFetchChatData = (showRoles) => {
const { RCInstance } = useContext(RCContext);
const setMemberRoles = useMemberStore((state) => state.setMemberRoles);
const isChannelPrivate = useChannelStore((state) => state.isChannelPrivate);
const setMessages = useMessageStore((state) => state.setMessages);
const setMessagesOffset = useMessageStore((state) => state.setMessagesOffset);
const setAdmins = useMemberStore((state) => state.setAdmins);
const setMemberRoles = useMemberStore((state) => state.setMemberRoles);
const permissionsRef = useRef(null);
const setStarredMessages = useStarredMessageStore(
(state) => state.setStarredMessages
Expand Down Expand Up @@ -127,10 +126,26 @@ const useFetchChatData = (showRoles) => {
return;
}

let channelIsPrivate = false;
if (!anonymousMode) {
const { channelInfo, setChannelInfo, setIsChannelPrivate } =
useChannelStore.getState();
if (channelInfo?._id) {
channelIsPrivate = channelInfo.t === 'p';
} else {
const res = await RCInstance.channelInfo();
if (res?.success) {
setChannelInfo(res.room);
channelIsPrivate = res.room.t === 'p';
if (channelIsPrivate) setIsChannelPrivate(true);
}
}
}

const { messages, count } = await RCInstance.getMessages(
anonymousMode,
undefined,
anonymousMode ? false : isChannelPrivate
channelIsPrivate
);

if (messages) {
Expand All @@ -143,7 +158,7 @@ const useFetchChatData = (showRoles) => {
}

if (showRoles) {
const { roles } = await RCInstance.getChannelRoles(isChannelPrivate);
const { roles } = await RCInstance.getChannelRoles(channelIsPrivate);
const fetchedRoles = await RCInstance.getUserRoles();
const fetchedAdmins = fetchedRoles?.result;

Expand All @@ -167,7 +182,6 @@ const useFetchChatData = (showRoles) => {
[
isUserAuthenticated,
RCInstance,
isChannelPrivate,
showRoles,
setMessages,
setAdmins,
Expand Down
Loading