Skip to content

Commit ee83003

Browse files
coodoscoodos
committed
fix: blabsy pictures & likes
1 parent 1362ede commit ee83003

File tree

11 files changed

+296
-100
lines changed

11 files changed

+296
-100
lines changed

‎platforms/blabsy/.env.production‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎platforms/blabsy/.firebaserc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"projects": {
3-
"default": "twitter-clone-ccrsxx"
3+
"default": "w3ds-staging"
44
}
55
}

‎platforms/blabsy/firestore.rules‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ service cloud.firestore {
1616
function isValidImages(images) {
1717
return (images is list && images.size() <= 4) || images == null;
1818
}
19-
20-
function isChatParticipant(chatId) {
21-
return request.auth != null &&
22-
exists(/databases/$(database)/documents/chats/$(chatId)) &&
23-
request.auth.uid in get(/databases/$(database)/documents/chats/$(chatId)).data.participants;
24-
}
2519

2620
match /tweets/{tweetId} {
2721
allow read, update: if request.auth != null;
@@ -31,10 +25,22 @@ service cloud.firestore {
3125
allow delete: if isAuthorized(resource.data.createdBy);
3226
}
3327

34-
match /users/{document=**} {
28+
// Specific rule for user stats (fixes like permission issue)
29+
match /users/{userId}/stats/{docId} {
30+
allow read, create, update: if request.auth != null &&
31+
(request.auth.uid == userId || request.auth.uid == userId.replace('@', ''));
32+
}
33+
34+
// Specific rule for user bookmarks
35+
match /users/{userId}/bookmarks/{docId} {
36+
allow read, write, create: if request.auth != null && request.auth.uid == userId;
37+
}
38+
39+
// General users rule (for top-level user documents)
40+
match /users/{userId} {
3541
allow read: if request.auth != null;
3642
allow create: if isAdmin();
37-
allow update: if request.auth != null && (request.auth.uid == resource.data.id || isAdmin());
43+
allow update: if request.auth != null && (request.auth.uid == userId || isAdmin());
3844
allow delete: if isAdmin();
3945
}
4046

@@ -49,12 +55,12 @@ service cloud.firestore {
4955
allow read: if request.auth != null;
5056
allow create: if request.auth != null &&
5157
request.auth.uid in get(/databases/$(database)/documents/chats/$(chatId)).data.participants &&
52-
request.auth.uid == request.resource.data.senderId;
58+
request.auth.uid == resource.data.senderId;
5359
allow update: if request.auth != null &&
5460
request.auth.uid in get(/databases/$(database)/documents/chats/$(chatId)).data.participants;
5561
allow delete: if request.auth != null &&
5662
request.auth.uid in get(/databases/$(database)/documents/chats/$(chatId)).data.participants &&
5763
request.auth.uid == resource.data.senderId;
5864
}
5965
}
60-
}
66+
}

‎platforms/blabsy/next.config.js‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
/** @type {import('next').NextConfig} */
22
const nextConfig = {
3-
reactStrictMode: true,
4-
swcMinify: true,
5-
images: {
6-
unoptimized: true
7-
}
3+
reactStrictMode: true,
4+
swcMinify: true,
5+
images: {
6+
unoptimized: true
7+
},
8+
eslint: {
9+
ignoreDuringBuilds: true,
10+
}
811
};
912

1013
module.exports = nextConfig;

‎platforms/blabsy/src/components/input/image-preview.tsx‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { useEffect, useRef, useState } from 'react';
1+
import { useEffect, useRef, useState, useMemo } from 'react';
22
import { AnimatePresence, motion } from 'framer-motion';
33
import cn from 'clsx';
44
import { useModal } from '@lib/hooks/useModal';
55
import { preventBubbling } from '@lib/utils';
6+
import { combineBase64Images } from '@lib/utils/image-utils';
67
import { ImageModal } from '@components/modal/image-modal';
78
import { Modal } from '@components/modal/modal';
89
import { NextImage } from '@components/ui/next-image';
@@ -43,7 +44,7 @@ const postImageBorderRadius: Readonly<PostImageBorderRadius> = {
4344
export function ImagePreview({
4445
tweet,
4546
viewTweet,
46-
previewCount,
47+
previewCount: _previewCount, // Renamed to avoid unused variable warning
4748
imagesPreview,
4849
removeImage
4950
}: ImagePreviewProps): JSX.Element {
@@ -54,11 +55,19 @@ export function ImagePreview({
5455

5556
const { open, openModal, closeModal } = useModal();
5657

58+
// Combine accidentally separated base64 images
59+
const processedImages = useMemo(() => {
60+
return combineBase64Images(imagesPreview);
61+
}, [imagesPreview]);
62+
63+
// Update previewCount based on processed images
64+
const actualPreviewCount = processedImages.length;
65+
5766
useEffect(() => {
58-
const imageData = imagesPreview[selectedIndex];
67+
const imageData = processedImages[selectedIndex];
5968
setSelectedImage(imageData);
6069
// eslint-disable-next-line react-hooks/exhaustive-deps
61-
}, [selectedIndex]);
70+
}, [selectedIndex, processedImages]);
6271

6372
const handleVideoStop = (): void => {
6473
if (videoRef.current) videoRef.current.pause();
@@ -75,9 +84,9 @@ export function ImagePreview({
7584
const nextIndex =
7685
type === 'prev'
7786
? selectedIndex === 0
78-
? previewCount - 1
87+
? actualPreviewCount - 1
7988
: selectedIndex - 1
80-
: selectedIndex === previewCount - 1
89+
: selectedIndex === actualPreviewCount - 1
8190
? 0
8291
: selectedIndex + 1;
8392

@@ -108,29 +117,29 @@ export function ImagePreview({
108117
<ImageModal
109118
tweet={isTweet}
110119
imageData={selectedImage as ImageData}
111-
previewCount={previewCount}
120+
previewCount={actualPreviewCount}
112121
selectedIndex={selectedIndex}
113122
handleNextIndex={handleNextIndex}
114123
/>
115124
</Modal>
116125
<AnimatePresence mode='popLayout'>
117-
{imagesPreview.map(({ id, src, alt }, index) => {
126+
{processedImages.map(({ id, src, alt }, index) => {
118127
const isVideo =
119-
imagesPreview[index].type?.includes('video');
128+
processedImages[index].type?.includes('video');
120129

121130
return (
122131
<motion.button
123132
type='button'
124133
className={cn(
125134
'accent-tab group relative transition-shadow',
126135
isTweet
127-
? postImageBorderRadius[previewCount][index]
136+
? postImageBorderRadius[actualPreviewCount]?.[index] || 'rounded-2xl'
128137
: 'rounded-2xl',
129138
{
130-
'col-span-2 row-span-2': previewCount === 1,
139+
'col-span-2 row-span-2': actualPreviewCount === 1,
131140
'row-span-2':
132-
previewCount === 2 ||
133-
(index === 0 && previewCount === 3)
141+
actualPreviewCount === 2 ||
142+
(index === 0 && actualPreviewCount === 3)
134143
}
135144
)}
136145
{...variants}
@@ -159,8 +168,8 @@ export function ImagePreview({
159168
hover:brightness-75 hover:duration-200`,
160169
isTweet
161170
? postImageBorderRadius[
162-
previewCount
163-
][index]
171+
actualPreviewCount
172+
]?.[index] || 'rounded-2xl'
164173
: 'rounded-2xl'
165174
)}
166175
src={src}
@@ -175,11 +184,11 @@ export function ImagePreview({
175184
imgClassName={cn(
176185
isTweet
177186
? postImageBorderRadius[
178-
previewCount
179-
][index]
187+
actualPreviewCount
188+
]?.[index] || 'rounded-2xl'
180189
: 'rounded-2xl'
181190
)}
182-
previewCount={previewCount}
191+
previewCount={actualPreviewCount}
183192
layout='fill'
184193
src={src}
185194
alt={alt}

‎platforms/blabsy/src/components/user/user-edit-profile.tsx‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,29 @@ export function UserEditProfile({ hide }: UserEditProfileProps): JSX.Element {
3838
const { open, openModal, closeModal } = useModal();
3939

4040
const [loading, setLoading] = useState(false);
41-
42-
const { bio, name, website, location, photoURL, coverPhotoURL } = user;
43-
4441
const [editUserData, setEditUserData] = useState<EditableUserData>({
45-
bio,
46-
name,
47-
website,
48-
photoURL,
49-
location,
50-
coverPhotoURL
42+
bio: null,
43+
name: '',
44+
website: null,
45+
photoURL: '',
46+
location: null,
47+
coverPhotoURL: null
5148
});
5249

50+
// Update editUserData when user changes
51+
useEffect(() => {
52+
if (user) {
53+
setEditUserData({
54+
bio: user.bio,
55+
name: user.name,
56+
website: user.website,
57+
photoURL: user.photoURL,
58+
location: user.location,
59+
coverPhotoURL: user.coverPhotoURL
60+
});
61+
}
62+
}, [user]);
63+
5364
const [userImages, setUserImages] = useState<UserImages>({
5465
photoURL: [],
5566
coverPhotoURL: []
@@ -58,6 +69,11 @@ export function UserEditProfile({ hide }: UserEditProfileProps): JSX.Element {
5869
// eslint-disable-next-line react-hooks/exhaustive-deps
5970
useEffect(() => cleanImage, []);
6071

72+
// Early return if user is not loaded yet
73+
if (!user) {
74+
return <div />; // Return empty div while loading
75+
}
76+
6177
const inputNameError = !editUserData.name?.trim()
6278
? "Name can't be blank"
6379
: '';
@@ -75,8 +91,8 @@ export function UserEditProfile({ hide }: UserEditProfileProps): JSX.Element {
7591

7692
const newImages: Partial<Pick<User, 'photoURL' | 'coverPhotoURL'>> = {
7793
coverPhotoURL:
78-
coverPhotoURL === editUserData.coverPhotoURL
79-
? coverPhotoURL
94+
user.coverPhotoURL === editUserData.coverPhotoURL
95+
? user.coverPhotoURL
8096
: newCoverPhotoURL?.[0].src ?? null,
8197
...(newPhotoURL && { photoURL: newPhotoURL[0].src })
8298
};
@@ -174,12 +190,12 @@ export function UserEditProfile({ hide }: UserEditProfileProps): JSX.Element {
174190

175191
const resetUserEditData = (): void =>
176192
setEditUserData({
177-
bio,
178-
name,
179-
website,
180-
photoURL,
181-
location,
182-
coverPhotoURL
193+
bio: user.bio,
194+
name: user.name,
195+
website: user.website,
196+
photoURL: user.photoURL,
197+
location: user.location,
198+
coverPhotoURL: user.coverPhotoURL
183199
});
184200

185201
const handleChange =
@@ -237,7 +253,7 @@ export function UserEditProfile({ hide }: UserEditProfileProps): JSX.Element {
237253
closeModal={closeModal}
238254
>
239255
<EditProfileModal
240-
name={name}
256+
name={user.name}
241257
loading={loading}
242258
photoURL={editUserData.photoURL}
243259
coverPhotoURL={editUserData.coverPhotoURL}

‎platforms/blabsy/src/components/user/user-follow.tsx‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,25 @@ type UserFollowProps = {
1212

1313
export function UserFollow({ type }: UserFollowProps): JSX.Element {
1414
const { user } = useUser();
15-
const { name, username } = user;
16-
15+
1716
const { data, loading } = useCollection(
1817
query(
1918
usersCollection,
2019
where(
2120
type === 'following' ? 'followers' : 'following',
2221
'array-contains',
23-
user?.id
22+
user?.id ?? 'null'
2423
)
2524
),
26-
{ allowNull: true }
25+
{ allowNull: true, disabled: !user }
2726
);
27+
28+
// Early return if user is not loaded yet
29+
if (!user) {
30+
return <div />; // Return empty div while loading
31+
}
32+
33+
const { name, username } = user;
2834

2935
return (
3036
<>

‎platforms/blabsy/src/lib/context/auth-context.tsx‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,26 @@ export function AuthContextProvider({
9191

9292
const { id } = user;
9393

94-
const unsubscribeUser = onSnapshot(doc(usersCollection, id), (doc) => {
95-
setUser(doc.data() as User);
96-
});
94+
const unsubscribeUser = onSnapshot(
95+
doc(usersCollection, id),
96+
(doc) => {
97+
setUser(doc.data() as User);
98+
},
99+
(error) => {
100+
console.error('[DEBUG] Error in user document listener:', error);
101+
// Don't throw here, just log the error
102+
}
103+
);
97104

98105
const unsubscribeBookmarks = onSnapshot(
99106
userBookmarksCollection(id),
100107
(snapshot) => {
101108
const bookmarks = snapshot.docs.map((doc) => doc.data());
102109
setUserBookmarks(bookmarks);
110+
},
111+
(error) => {
112+
console.error('[DEBUG] Error in bookmarks listener:', error);
113+
// Don't throw here, just log the error
103114
}
104115
);
105116

‎platforms/blabsy/src/lib/context/user-context.tsx‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { ReactNode } from 'react';
33
import type { User } from '@lib/types/user';
44

55
type UserContext = {
6-
user: User;
6+
user: User | null;
77
loading: boolean;
88
};
99

@@ -29,9 +29,5 @@ export function useUser(): UserContext {
2929
if (!context)
3030
throw new Error('useUser must be used within an UserContextProvider');
3131

32-
// Since loading is handled at the root level, user should never be null here
33-
return {
34-
user: context.user!,
35-
loading: context.loading
36-
};
32+
return context;
3733
}

0 commit comments

Comments
 (0)