binwiederhier/ntfy
1
0
Fork 0
mirror of https://github.com/binwiederhier/ntfy.git synced 2024-12-29 03:45:05 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #820 from nihalgonsalves/ng/display-external-images

Browse Source 
fix: check extension to display external images
This commit is contained in:
Philipp C. Heckel 2023-08-08 20:47:43 -04:00 committed by GitHub
commit 7d20238423
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/app/notificationUtils.js
View File

@ -35,7 +35,7 @@ export const formatMessage = (m) => {
}; };
const imageRegex = /\.(png|jpe?g|gif|webp)$/i; const imageRegex = /\.(png|jpe?g|gif|webp)$/i;
const isImage = (attachment) => { export const isImage = (attachment) => {
if (!attachment) return false; if (!attachment) return false;
// if there's a type, only take that into account // if there's a type, only take that into account

4
web/src/components/Notifications.jsx
View File

@ -27,7 +27,7 @@ import { useOutletContext } from "react-router-dom";
import { useRemark } from "react-remark"; import { useRemark } from "react-remark";
import styled from "@emotion/styled"; import styled from "@emotion/styled";
import { formatBytes, formatShortDateTime, maybeActionErrors, openUrl, shortUrl, topicShortUrl, unmatchedTags } from "../app/utils"; import { formatBytes, formatShortDateTime, maybeActionErrors, openUrl, shortUrl, topicShortUrl, unmatchedTags } from "../app/utils";
import { formatMessage, formatTitle } from "../app/notificationUtils"; import { formatMessage, formatTitle, isImage } from "../app/notificationUtils";
import { LightboxBackdrop, Paragraph, VerticallyCenteredContainer } from "./styles"; import { LightboxBackdrop, Paragraph, VerticallyCenteredContainer } from "./styles";
import subscriptionManager from "../app/SubscriptionManager"; import subscriptionManager from "../app/SubscriptionManager";
import priority1 from "../img/priority-1.svg"; import priority1 from "../img/priority-1.svg";
@ -346,7 +346,7 @@ const Attachment = (props) => {
const { attachment } = props; const { attachment } = props;
const expired = attachment.expires && attachment.expires < Date.now() / 1000; const expired = attachment.expires && attachment.expires < Date.now() / 1000;
const expires = attachment.expires && attachment.expires > Date.now() / 1000; const expires = attachment.expires && attachment.expires > Date.now() / 1000;
const displayableImage = !expired && attachment.type && attachment.type.startsWith("image/"); const displayableImage = !expired && isImage(attachment);
// Unexpired image // Unexpired image
if (displayableImage) { if (displayableImage) {