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

Disable chatMessages query if blocked

Browse source
This commit is contained in:
Chewbacca 2022-10-25 13:10:53 -04:00
parent f156c1026d
commit 22f3dd9444
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/soapbox/features/chats/components/chat-message-list.tsx
View file

@ -87,7 +87,7 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat, autosize }) => {
isFetchingNextPage, isFetchingNextPage,
isLoading, isLoading,
refetch, refetch,
} = useChatMessages(chat.id); } = useChatMessages(chat);
const formattedChatMessages = chatMessages || []; const formattedChatMessages = chatMessages || [];

8
app/soapbox/queries/chats.ts
View file

@ -7,7 +7,7 @@ import { getNextLink } from 'soapbox/api';
import compareId from 'soapbox/compare_id'; import compareId from 'soapbox/compare_id';
import { useChatContext } from 'soapbox/contexts/chat-context'; import { useChatContext } from 'soapbox/contexts/chat-context';
import { useStatContext } from 'soapbox/contexts/stat-context'; import { useStatContext } from 'soapbox/contexts/stat-context';
import { useApi, useAppDispatch, useFeatures } from 'soapbox/hooks'; import { useApi, useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks';
import { flattenPages, PaginatedResult, updatePageItem } from 'soapbox/utils/queries'; import { flattenPages, PaginatedResult, updatePageItem } from 'soapbox/utils/queries';
import { queryClient } from './client'; import { queryClient } from './client';
@ -52,8 +52,9 @@ const ChatKeys = {
const reverseOrder = (a: IChat, b: IChat): number => compareId(a.id, b.id); const reverseOrder = (a: IChat, b: IChat): number => compareId(a.id, b.id);
const useChatMessages = (chatId: string) => { const useChatMessages = (chat: IChat) => {
const api = useApi(); const api = useApi();
const isBlocked = useAppSelector((state) => state.getIn(['relationships', chat.account.id, 'blocked_by']));
const getChatMessages = async (chatId: string, pageParam?: any): Promise<PaginatedResult<IChatMessage>> => { const getChatMessages = async (chatId: string, pageParam?: any): Promise<PaginatedResult<IChatMessage>> => {
const nextPageLink = pageParam?.link; const nextPageLink = pageParam?.link;
@ -72,7 +73,8 @@ const useChatMessages = (chatId: string) => {
}; };
}; };
const queryInfo = useInfiniteQuery(ChatKeys.chatMessages(chatId), ({ pageParam }) => getChatMessages(chatId, pageParam), { const queryInfo = useInfiniteQuery(ChatKeys.chatMessages(chat.id), ({ pageParam }) => getChatMessages(chat.id, pageParam), {
enabled: !isBlocked,
getNextPageParam: (config) => { getNextPageParam: (config) => {
if (config.hasMore) { if (config.hasMore) {
return { link: config.link }; return { link: config.link };