Skip to content
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

Fix videos not rendering in comments #877

Merged
merged 20 commits into from
Nov 18, 2023
Merged

Fix videos not rendering in comments #877

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
12b488d
quick fix for webms not rendering
sharunkumar Nov 1, 2023
f325999
remove `max-height`
sharunkumar Nov 1, 2023
1615011
added alt and draggable props to video
sharunkumar Nov 1, 2023
d73dfca
use `mime` to determine if its a video
sharunkumar Nov 1, 2023
5bf2fe7
minor code touch-up
sharunkumar Nov 1, 2023
9fd77f9
use `<Video/>` component instead
sharunkumar Nov 2, 2023
8de7d4d
remove unused variable
sharunkumar Nov 2, 2023
bdccb73
Merge Release 1.19.2
sharunkumar Nov 3, 2023
da3bdde
Merge Release 1.19.3
sharunkumar Nov 3, 2023
1b31625
Merge Release 1.21.0
sharunkumar Nov 6, 2023
079a051
update `isUrlImage` and `isUrlVideo` to use `mime`
sharunkumar Nov 6, 2023
01cf362
lint fix
sharunkumar Nov 7, 2023
87e7d01
refactor functions
sharunkumar Nov 7, 2023
676d5d8
Merge Release 1.22.0
sharunkumar Nov 8, 2023
ca9720e
updated to use
sharunkumar Nov 8, 2023
138ce65
Merge Release 1.22.1
sharunkumar Nov 9, 2023
4548371
Merge Release 1.23.0
sharunkumar Nov 10, 2023
bd82835
Merge Release 1.23.2
sharunkumar Nov 11, 2023
0a7df9c
Merge branch 'main' into comment-webm
aeharding Nov 17, 2023
b061e38
Refactor image logic, add extra test cases, small videos in comments,…
aeharding Nov 17, 2023
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
Prev Previous commit
Next Next commit
update isUrlImage and isUrlVideo to use mime
  • Loading branch information
@sharunkumar
sharunkumar committed Nov 6, 2023
commit 079a051e8ae63c2deed71bda4a18bd76498a2b51
15 changes: 5 additions & 10 deletions src/helpers/lemmy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
} from "lemmy-js-client";
import { Share } from "@capacitor/share";
import { escapeStringForRegex } from "./regex";
import mime from "mime";

export interface LemmyJWT {
sub: number;
Expand Down Expand Up @@ -235,31 +236,25 @@ export function isUrlImage(url: string): boolean {

try {
parsedUrl = new URL(url);
let mt = mime.getType(url);
return mt?.startsWith("image/") ?? false;
} catch (error) {
console.error(error);
return false;
}

return (
parsedUrl.pathname.endsWith(".jpeg") ||
parsedUrl.pathname.endsWith(".png") ||
parsedUrl.pathname.endsWith(".gif") ||
parsedUrl.pathname.endsWith(".jpg") ||
parsedUrl.pathname.endsWith(".webp")
);
}

export function isUrlVideo(url: string): boolean {
let parsedUrl;

try {
parsedUrl = new URL(url);
let mt = mime.getType(url);
return mt?.startsWith("video/") ?? false;
} catch (error) {
console.error(error);
return false;
}

return parsedUrl.pathname.endsWith(".mp4");
}

export function share(item: Post | Comment) {
Expand Down