From 6d37c06cd66396c31e0d7e8fcc54543836d2a544 Mon Sep 17 00:00:00 2001 From: Wadie-ess Date: Wed, 15 Nov 2023 20:50:35 +0100 Subject: [PATCH] merge blocked messages --- backend/code/src/rooms/rooms.service.ts | 2 +- backend/code/src/users/users.controller.ts | 5 ++++- backend/code/src/users/users.service.ts | 4 ++-- .../Components/Chat/Components/Conversation.tsx | 6 +----- .../Components/Chat/Components/RecentChat.tsx | 2 ++ .../Chat/Components/RoomChatHelpers.tsx | 17 ++++------------- frontend/code/src/Components/Chat/index.tsx | 7 ++----- frontend/code/src/Components/Layout/index.tsx | 4 +--- frontend/code/src/Components/Profile/index.tsx | 7 ++----- 9 files changed, 19 insertions(+), 35 deletions(-) diff --git a/backend/code/src/rooms/rooms.service.ts b/backend/code/src/rooms/rooms.service.ts index 5e047a2..9b68ff1 100644 --- a/backend/code/src/rooms/rooms.service.ts +++ b/backend/code/src/rooms/rooms.service.ts @@ -717,7 +717,7 @@ export class RoomsService { }, }, }); - + const dmsData: DMsData[] = await Promise.all( rooms.map(async (room) => { const secondMember = room.members.find( diff --git a/backend/code/src/users/users.controller.ts b/backend/code/src/users/users.controller.ts index e58c4c2..f62ada3 100644 --- a/backend/code/src/users/users.controller.ts +++ b/backend/code/src/users/users.controller.ts @@ -23,7 +23,10 @@ export class UsersController { @Get('search') @HttpCode(HttpStatus.OK) @UseGuards(AtGuard) - async getUsers(@Query() query: usersSearchDto, @GetCurrentUser('userId') userId: string) { + async getUsers( + @Query() query: usersSearchDto, + @GetCurrentUser('userId') userId: string, + ) { return this.usersService.getUsers(query.q, userId); } diff --git a/backend/code/src/users/users.service.ts b/backend/code/src/users/users.service.ts index d15d63c..9b389db 100644 --- a/backend/code/src/users/users.service.ts +++ b/backend/code/src/users/users.service.ts @@ -128,8 +128,8 @@ export class UsersService { blocked_by_id: currentUserId, }, }, - } - ] + }, + ], }, }, }); diff --git a/frontend/code/src/Components/Chat/Components/Conversation.tsx b/frontend/code/src/Components/Chat/Components/Conversation.tsx index cb5b728..ea1457f 100644 --- a/frontend/code/src/Components/Chat/Components/Conversation.tsx +++ b/frontend/code/src/Components/Chat/Components/Conversation.tsx @@ -12,7 +12,7 @@ import { ChatType, useChatStore } from "../Controllers/RoomChatControllers"; import { ChatPlaceHolder, ConfirmationModal } from "./RoomChatHelpers"; import { KeyboardEvent } from "react"; -import { createNewRoomCall, leaveRoomCall } from "../Services/ChatServices"; +import { leaveRoomCall } from "../Services/ChatServices"; import toast from "react-hot-toast"; import { useModalStore } from "../Controllers/LayoutControllers"; import { @@ -24,7 +24,6 @@ import { useUserStore } from "../../../Stores/stores"; import { formatTime } from "./tools/utils"; import { useSocketStore } from "../Services/SocketsServices"; import { useNavigate } from "react-router-dom"; -import { useInView } from "react-intersection-observer"; import { blockUserCall } from "../Services/FriendsServices"; import { InvitationWaiting } from "../../Layout/Assets/Invitationacceptance"; @@ -359,9 +358,6 @@ export const ConversationHeader: React.FC = ({ export const Conversation: React.FC = ({ onRemoveUserPreview, }) => { - const [ref, inView] = useInView(); - const [EndOfFetching, setEndOfFetching] = useState(false); - const chatState = useChatStore(); const messageContainerRef = useRef(null); const socketStore = useSocketStore(); diff --git a/frontend/code/src/Components/Chat/Components/RecentChat.tsx b/frontend/code/src/Components/Chat/Components/RecentChat.tsx index 8df3c0c..178edc7 100644 --- a/frontend/code/src/Components/Chat/Components/RecentChat.tsx +++ b/frontend/code/src/Components/Chat/Components/RecentChat.tsx @@ -81,6 +81,7 @@ export const RecentConversations = () => { } } }); + // eslint-disable-next-line }, [ChatRoomsState.recentDms]); useEffect(() => { @@ -88,6 +89,7 @@ export const RecentConversations = () => { return () => { setEndOfFetching(false); }; + // eslint-disable-next-line }, []); useEffect(() => { diff --git a/frontend/code/src/Components/Chat/Components/RoomChatHelpers.tsx b/frontend/code/src/Components/Chat/Components/RoomChatHelpers.tsx index a20c0d3..bffdfda 100644 --- a/frontend/code/src/Components/Chat/Components/RoomChatHelpers.tsx +++ b/frontend/code/src/Components/Chat/Components/RoomChatHelpers.tsx @@ -91,6 +91,7 @@ export const RoomChatPlaceHolder = () => { } } }); + // eslint-disable-next-line }, [ ChatRoomsState.recentRooms, setIsLoading, @@ -105,6 +106,7 @@ export const RoomChatPlaceHolder = () => { setEndOfFetching(false); ChatRoomsState.fillRecentRooms([]); }; + // eslint-disable-next-line }, [ChatRoomsState.selectedChatType, ChatRoomsState.recentRoomsOnchange]); useEffect(() => { @@ -199,7 +201,6 @@ export const CreateNewRoomModal = () => { setName(event.target.value); }; - const createNewRoom = useChatStore((state) => state.createNewRoom); const [selectedOption, setSelectedOption] = useState(RoomType.public); const setIsLoading = useChatStore((state) => state.setIsLoading); const chatState = useChatStore((state) => state); @@ -540,9 +541,6 @@ export const BlockedUsersModal = () => { }; export const FriendStatusTile = (props: { user: RoomMember }) => { - const [IsAdding, setIsAdding] = useState(false); - const selectedChatID = useChatStore((state) => state.selectedChatID); - const LayoutState = useModalStore((state) => state); const user = props.user; const [onlineStatus, setOnlineStatus] = useState("offline"); const socketStore = useSocketStore((state) => state); @@ -601,7 +599,6 @@ export const FriendStatusTile = (props: { user: RoomMember }) => { export const FriendsListModal = () => { const [currentFriends, setUsers] = useState([]); - const [onlineStatus, setOnlineStatus] = useState("offline"); const LayoutState = useModalStore((state) => state); const [IsLoading, setIsLoading] = useState(false); @@ -701,15 +698,10 @@ export const AddUsersModal = () => { const [skipCount, setSkipCount] = useState(true); const ChatState = useChatStore((state) => state); - const [ref, inView] = useInView(); - const [EndOfFetching, setEndOfFetching] = useState(false); - useEffect(() => { if (skipCount) setSkipCount(false); if (!skipCount) { const fetchData = async () => { - const offset = currentFriends.length; - try { setIsLoading(true); @@ -760,9 +752,8 @@ export const AddUsersModal = () => { console.error("Error fetching data: ", error); } }; - if (!EndOfFetching) { - fetchData(); - } + + fetchData(); } // eslint-disable-next-line }, [LayoutState.showAddUsersModal]); diff --git a/frontend/code/src/Components/Chat/index.tsx b/frontend/code/src/Components/Chat/index.tsx index 6c26115..551a48d 100644 --- a/frontend/code/src/Components/Chat/index.tsx +++ b/frontend/code/src/Components/Chat/index.tsx @@ -27,7 +27,7 @@ import { getRoomMembersCall } from "./Services/ChatServices"; import { classNames } from "../../Utils/helpers"; import { useModalStore } from "./Controllers/LayoutControllers"; -import { useInView } from "react-intersection-observer"; + import { useNavigate } from "react-router-dom"; export interface ConversationProps { @@ -41,7 +41,6 @@ export const Chat = () => { const showChatRooms = useChatStore((state) => state.showChatRooms); const toggleChatRooms = useChatStore((state) => state.toggleChatRooms); - const chatRooms = useChatStore((state) => state.recentRooms); const handleRemoveUserPreview = () => { setShowUserPreview(!showUserPreview); }; @@ -210,9 +209,7 @@ export const UserPreviewCard: React.FC = ({