Skip to content

fix: upload file/image and respect app settings #2976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khushal87 merged 6 commits into from
Feb 24, 2025
Merged

fix: upload file/image and respect app settings #2976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
06cf965
fix: file upload preview state refresh when state changes
khushal87 Feb 21, 2025
5bd1daa
Merge branch 'develop' of github.com:GetStream/stream-chat-react-nati…
khushal87 Feb 21, 2025
6fe72a4
fix: upload file/image and respect app settings
khushal87 Feb 24, 2025
4ab626d
Merge branch 'develop' of github.com:GetStream/stream-chat-react-nati…
khushal87 Feb 24, 2025
3533a8a
fix: upload file/image and respect app settings
khushal87 Feb 24, 2025
2626b46
fix: upload file/image and respect app settings
khushal87 Feb 24, 2025
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
7 changes: 5 additions & 2 deletions package/expo-package/src/optionalDependencies/takePhoto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const takePhoto = ImagePicker
...photo,
cancelled: false,
duration: photo.duration, // in milliseconds
name: 'video_recording_' + date + photo.uri.split('.').pop(),
name: 'video_recording_' + date + '.' + photo.uri.split('.').pop(),
Copy link
Contributor

@isekovanic isekovanic Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really don't like how we sort of blindly do this - this can break on so many levels. Let's merge since it appears to never have worked but we need to fix this soon.

size: photo.fileSize,
source: 'camera',
type: photo.mimeType,
Expand Down Expand Up @@ -91,9 +91,12 @@ export const takePhoto = ImagePicker
width: photo.width,
};
}

const clearFilter = new RegExp('[.:]', 'g');
const date = new Date().toISOString().replace(clearFilter, '_');
return {
cancelled: false,
mimeType: photo.mimeType,
name: 'image_' + date + '.' + photo.uri.split('.').pop(),
size: photo.fileSize,
source: 'camera',
type: photo.mimeType,
Expand Down
7 changes: 6 additions & 1 deletion package/native-package/src/optionalDependencies/takePhoto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ export const takePhoto = ImagePicker
...asset,
cancelled: false,
duration: asset.duration * 1000,
name: 'video_recording_' + date + asset.fileName.split('.').pop(),
mimeType: asset.type,
name: 'video_recording_' + date + '.' + asset.fileName.split('.').pop(),
size: asset.fileSize,
source: 'camera',
type: asset.type,
Expand Down Expand Up @@ -85,8 +86,12 @@ export const takePhoto = ImagePicker
width: asset.width,
};
}
const clearFilter = new RegExp('[.:]', 'g');
const date = new Date().toISOString().replace(clearFilter, '_');
return {
cancelled: false,
mimeType: asset.type,
name: 'video_recording_' + date + '.' + asset.fileName.split('.').pop(),
size: asset.size,
source: 'camera',
type: asset.type,
Expand Down
22 changes: 20 additions & 2 deletions package/src/contexts/messageInputContext/utils/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,16 @@ export const isUploadAllowed = ({ config, file }: CheckUploadPermissionsParams)
}

if (allowed_mime_types?.length) {
if (file.name) {
if (file.mimeType) {
const allowed = allowed_mime_types.some(
(mimeType: string) =>
file.mimeType && file.mimeType.toLowerCase() === mimeType.toLowerCase(),
);

if (!allowed) {
return false;
}
} else if (file.name) {
const fileMimeType = lookup(file.name) as string;
const allowed = allowed_mime_types.some(
(mimeType: string) => fileMimeType.toLowerCase() === mimeType.toLowerCase(),
Expand All @@ -57,7 +66,16 @@ export const isUploadAllowed = ({ config, file }: CheckUploadPermissionsParams)
}

if (blocked_mime_types?.length) {
if (file.name) {
if (file.mimeType) {
const blocked = blocked_mime_types.some(
(mimeType: string) =>
file.mimeType && file.mimeType.toLowerCase() === mimeType.toLowerCase(),
);

if (blocked) {
return false;
}
} else if (file.name) {
const fileMimeType = lookup(file.name) as string;
const blocked = blocked_mime_types.some(
(mimeType: string) => fileMimeType.toLowerCase() === mimeType.toLowerCase(),
Expand Down
1 change: 1 addition & 0 deletions package/src/types/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export type Asset = {
uri: string;
width: number;
id?: string;
mimeType?: string;
originalUri?: string;
size?: number;
};
Expand Down
Loading