Skip to content

Commit 33aa82a

Browse files
MayankSingh173MayankSingh173
committed
minor bug fix
1 parent 0ef5c4c commit 33aa82a

File tree

4 files changed

+94
-70
lines changed

4 files changed

+94
-70
lines changed

‎src/hooks/Messages/Chat/useGetGroups.ts

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,19 @@ const useGetGroups = (uid: string) => {
2020
.limit(10)
2121
.onSnapshot(
2222
(querySnapshot) => {
23-
const localGroups: Group[] = [];
23+
if (querySnapshot) {
24+
const localGroups: Group[] = [];
2425

25-
for (const doc of querySnapshot.docs) {
26-
doc.exists && localGroups.push(doc.data() as Group);
27-
}
26+
for (const doc of querySnapshot.docs) {
27+
doc.exists && localGroups.push(doc.data() as Group);
28+
}
2829

29-
setGroups(localGroups);
30-
setLastDoc(querySnapshot.docs[querySnapshot.docs.length - 1]);
31-
setFetched(true);
30+
setGroups(localGroups);
31+
setLastDoc(querySnapshot.docs[querySnapshot.docs.length - 1]);
32+
setFetched(true);
33+
} else {
34+
setFetched(true);
35+
}
3236
},
3337
(error) => {
3438
console.log(error);
@@ -51,15 +55,19 @@ const useGetGroups = (uid: string) => {
5155
.startAfter(lastDoc)
5256
.limit(3)
5357
.onSnapshot((querySnapshot) => {
54-
const localGroups: Group[] = [];
58+
if (querySnapshot) {
59+
const localGroups: Group[] = [];
5560

56-
for (const doc of querySnapshot.docs) {
57-
doc.exists && localGroups.push(doc.data() as Group);
58-
}
61+
for (const doc of querySnapshot.docs) {
62+
doc.exists && localGroups.push(doc.data() as Group);
63+
}
5964

60-
setLastDoc(querySnapshot.docs[querySnapshot.docs.length - 1]);
61-
setGroups((prev) => [...prev, ...localGroups]);
62-
setIsMoreLoading(false);
65+
setLastDoc(querySnapshot.docs[querySnapshot.docs.length - 1]);
66+
setGroups((prev) => [...prev, ...localGroups]);
67+
setIsMoreLoading(false);
68+
} else {
69+
setIsMoreLoading(false);
70+
}
6371
});
6472

6573
return () => nextDocuments();

‎src/hooks/Messages/Chat/useGetMessages.ts

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,22 @@ const useGetMessages = (
3535
.orderBy('createdAt', 'desc')
3636
.limit(15)
3737
.onSnapshot((querySnapshot) => {
38-
const chats: IMessage[] = [];
39-
querySnapshot.forEach((doc) => {
40-
const local_message = doc.exists && (doc.data() as Message);
41-
chats.push({
42-
_id: local_message.messageId,
43-
text: local_message.text,
44-
createdAt: local_message.createdAt,
45-
user: getMemberDetailsFromUid(local_message.uid, group),
46-
system: local_message.system,
38+
if (querySnapshot) {
39+
const chats: IMessage[] = [];
40+
querySnapshot.forEach((doc) => {
41+
const local_message = doc.exists && (doc.data() as Message);
42+
chats.push({
43+
_id: local_message.messageId,
44+
text: local_message.text,
45+
createdAt: local_message.createdAt,
46+
user: getMemberDetailsFromUid(local_message.uid, group),
47+
system: local_message.system,
48+
});
4749
});
48-
});
4950

50-
setLastDoc(querySnapshot.docs[querySnapshot.docs.length - 1]);
51-
setMessages(chats);
51+
setLastDoc(querySnapshot.docs[querySnapshot.docs.length - 1]);
52+
setMessages(chats);
53+
}
5254
});
5355
return () => {
5456
unsubscribe();
@@ -71,21 +73,25 @@ const useGetMessages = (
7173
.startAfter(lastDoc)
7274
.limit(10)
7375
.onSnapshot((querySnapshot) => {
74-
const chats: IMessage[] = [];
75-
querySnapshot.forEach((doc) => {
76-
const local_message = doc.exists && (doc.data() as Message);
77-
chats.push({
78-
_id: local_message.messageId,
79-
text: local_message.text,
80-
createdAt: local_message.createdAt,
81-
user: getMemberDetailsFromUid(local_message.uid, group),
82-
system: local_message.system,
76+
if (querySnapshot) {
77+
const chats: IMessage[] = [];
78+
querySnapshot.forEach((doc) => {
79+
const local_message = doc.exists && (doc.data() as Message);
80+
chats.push({
81+
_id: local_message.messageId,
82+
text: local_message.text,
83+
createdAt: local_message.createdAt,
84+
user: getMemberDetailsFromUid(local_message.uid, group),
85+
system: local_message.system,
86+
});
8387
});
84-
});
8588

86-
setLastDoc(querySnapshot.docs[querySnapshot.docs.length - 1]);
87-
setMessages((prev) => [...prev, ...chats]);
88-
setIsMoreLoading(false);
89+
setLastDoc(querySnapshot.docs[querySnapshot.docs.length - 1]);
90+
setMessages((prev) => [...prev, ...chats]);
91+
setIsMoreLoading(false);
92+
} else {
93+
setIsMoreLoading(false);
94+
}
8995
});
9096
return () => nextDocuments();
9197
}

‎src/hooks/Messages/Meeting/useGetMeetMssg.ts

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,22 @@ const useGetMeetMssg = (Baithak: Baithak, firebaseUser: UserInterface) => {
2929
.orderBy('createdAt', 'desc')
3030
.limit(15)
3131
.onSnapshot((querySnapshot) => {
32-
const chats: IMessage[] = [];
33-
querySnapshot.forEach((doc) => {
34-
const local_message = doc.exists && (doc.data() as Message);
35-
chats.push({
36-
_id: local_message.messageId,
37-
text: local_message.text,
38-
createdAt: local_message.createdAt,
39-
user: getBaithakPartiFromUid(local_message.uid, Baithak),
40-
system: local_message.system,
32+
if (querySnapshot) {
33+
const chats: IMessage[] = [];
34+
querySnapshot.forEach((doc) => {
35+
const local_message = doc.exists && (doc.data() as Message);
36+
chats.push({
37+
_id: local_message.messageId,
38+
text: local_message.text,
39+
createdAt: local_message.createdAt,
40+
user: getBaithakPartiFromUid(local_message.uid, Baithak),
41+
system: local_message.system,
42+
});
4143
});
42-
});
4344

44-
setLastDoc(querySnapshot.docs[querySnapshot.docs.length - 1]);
45-
setMessages(chats);
45+
setLastDoc(querySnapshot.docs[querySnapshot.docs.length - 1]);
46+
setMessages(chats);
47+
}
4648
});
4749
return () => {
4850
unsubscribe();
@@ -65,21 +67,25 @@ const useGetMeetMssg = (Baithak: Baithak, firebaseUser: UserInterface) => {
6567
.startAfter(lastDoc)
6668
.limit(10)
6769
.onSnapshot((querySnapshot) => {
68-
const chats: IMessage[] = [];
69-
querySnapshot.forEach((doc) => {
70-
const local_message = doc.exists && (doc.data() as Message);
71-
chats.push({
72-
_id: local_message.messageId,
73-
text: local_message.text,
74-
createdAt: local_message.createdAt,
75-
user: getBaithakPartiFromUid(local_message.uid, Baithak),
76-
system: local_message.system,
70+
if (querySnapshot) {
71+
const chats: IMessage[] = [];
72+
querySnapshot.forEach((doc) => {
73+
const local_message = doc.exists && (doc.data() as Message);
74+
chats.push({
75+
_id: local_message.messageId,
76+
text: local_message.text,
77+
createdAt: local_message.createdAt,
78+
user: getBaithakPartiFromUid(local_message.uid, Baithak),
79+
system: local_message.system,
80+
});
7781
});
78-
});
7982

80-
setLastDoc(querySnapshot.docs[querySnapshot.docs.length - 1]);
81-
setMessages((prev) => [...prev, ...chats]);
82-
setIsMoreLoading(false);
83+
setLastDoc(querySnapshot.docs[querySnapshot.docs.length - 1]);
84+
setMessages((prev) => [...prev, ...chats]);
85+
setIsMoreLoading(false);
86+
} else {
87+
setIsMoreLoading(false);
88+
}
8389
});
8490
return () => nextDocuments();
8591
}

‎src/hooks/User/useGetUsers.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,17 @@ const useGetUsers = (uid: string) => {
1414
.where('uid', '!=', uid)
1515
.onSnapshot(
1616
(querySnapshot) => {
17-
const localUsers: UserInterface[] = [];
18-
for (const doc of querySnapshot.docs) {
19-
doc.exists && localUsers.push(doc.data() as UserInterface);
17+
if (querySnapshot) {
18+
const localUsers: UserInterface[] = [];
19+
for (const doc of querySnapshot.docs) {
20+
doc.exists && localUsers.push(doc.data() as UserInterface);
21+
}
22+
setUsers(localUsers);
23+
setFilteredUsers(localUsers);
24+
setLoading(false);
25+
} else {
26+
setLoading(false);
2027
}
21-
setUsers(localUsers);
22-
setFilteredUsers(localUsers);
23-
setLoading(false);
2428
},
2529
(err) => {
2630
console.log(err);

0 commit comments

Comments
 (0)