- ~{timeToGoEst(difficulty, hashrate)}
+ ~{timeToGoEst(difficulty, hashrate)} total
)
) : null}
diff --git a/client/src/components/modals/CardModals/QuoteEmbed.tsx b/client/src/components/modals/CardModals/QuoteEmbed.tsx
index 149ce8d..ae01a12 100644
--- a/client/src/components/modals/CardModals/QuoteEmbed.tsx
+++ b/client/src/components/modals/CardModals/QuoteEmbed.tsx
@@ -2,7 +2,7 @@ import { parseContent } from "../../../utils/content";
import { Event } from "nostr-tools";
import { getMetadata } from "../../../utils/getMetadata";
import ContentPreview from "./TextModal";
-import { renderMedia } from "../../../utils/FileUpload";
+import RenderMedia from "../MediaRender";
import { getIconFromHash, timeAgo } from "../../../utils/cardUtils";
import { CpuChipIcon } from "@heroicons/react/24/outline";
import { verifyPow } from "../../../utils/mine";
@@ -30,6 +30,7 @@ const QuoteEmbed = ({
{metadataParsed ?
![]()
{
- const findUrl = comment.match(/\bhttps?:\/\/\S+/gi);
- if (findUrl && findUrl.length > 0) {
- setUrl(findUrl[0]);
- setFinalComment(finalComment.replace(findUrl[0], "").trim());
- }
-
const match = comment.match(/\bnostr:(?:nevent1|note1)([a-z0-9]+)/i);
const nostrURI = match && match[1];
if (nostrURI && quoteEvents.length === 0) {
diff --git a/client/src/components/modals/MediaRender.tsx b/client/src/components/modals/MediaRender.tsx
new file mode 100644
index 0000000..7fdc986
--- /dev/null
+++ b/client/src/components/modals/MediaRender.tsx
@@ -0,0 +1,113 @@
+import { useEffect, useState } from "react";
+
+// Function to check media against the API
+const checkMedia = async (url: string) => {
+ try {
+ const token = process.env.REACT_APP_NSFW_TOKEN;
+ if (!token) {
+ console.error("NSFW token is not set in environment variables");
+ return null;
+ }
+
+ const response = await fetch('https://nsfw-detector-api-latest.onrender.com/predict', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Access-Control-Allow-Origin': '*',
+ 'Authorization': `Bearer ${token}`
+ },
+ body: JSON.stringify({ url }),
+ });
+ return await response.json();
+ } catch (error) {
+ console.error("Error checking media:", error);
+ return null;
+ }
+};
+
+const RenderMedia = ({ files }: { files: string[] }) => {
+ const gridTemplateColumns = files.length > 1 ? 'repeat(2, 1fr)' : 'repeat(1, 1fr)';
+ const gridTemplateRows = files.length > 2 ? 'repeat(2, 1fr)' : 'repeat(1, 1fr)';
+ const whitelistImageURL = ["nostr.build", "void.cat", "blossom.oxtr", "image.nostr.build"];
+ const [mediaCheckResults, setMediaCheckResults] = useState
>({});
+
+ // Function to toggle blur on click
+ const toggleBlur = (event: React.MouseEvent) => {
+ event.currentTarget.classList.toggle('no-blur');
+ };
+
+ useEffect(() => {
+ const performMediaChecks = async () => {
+ for (const file of files) {
+ const result = await checkMedia(file);
+ console.log(`Result for ${file}:`, result);
+ if (result && result.data && result.data.predictedLabel) {
+ setMediaCheckResults(prev => ({
+ ...prev,
+ [file]: { predictedLabel: result.data.predictedLabel }
+ }));
+ console.error(`Unexpected result structure for ${file}:`, result.data.predictedLabel);
+ } else {
+ console.error(`Unexpected result structure for ${file}:`, result);
+ }
+ }
+ };
+
+ if (Object.keys(mediaCheckResults).length === 0) {
+ performMediaChecks();
+ }
+ }, []);
+
+ return (
+
+ {files.map((file, index) => {
+ // Check if the file is from allowed domains
+ const isFromAllowedDomain = whitelistImageURL.some(domain => file.includes(domain));
+ const mediaCheckResult = mediaCheckResults[file];
+
+ // Only render if predictedLabel is neutral
+ if (mediaCheckResult && mediaCheckResult.predictedLabel !== 'neutral') {
+ return (
+
+
Attached media has been flagged as not safe for work.
+
+ );
+ }
+
+ if (file && (file.endsWith(".mp4") || file.endsWith(".webm")) && mediaCheckResult && mediaCheckResult.predictedLabel === 'neutral') {
+ return (
+
+ );
+ } else if (file && mediaCheckResult && mediaCheckResult.predictedLabel === 'neutral') {
+ return (
+
+ );
+ } else {
+ return (
+
+ );
+ }
+ })}
+
+
{repliedTo &&
Reply to:
{uniqBy(repliedTo, 'pubkey').map((parsedEvent, index) => {
diff --git a/client/src/components/routes/Settings.tsx b/client/src/components/routes/Settings.tsx
index 9f75e74..214ca96 100644
--- a/client/src/components/routes/Settings.tsx
+++ b/client/src/components/routes/Settings.tsx
@@ -79,7 +79,7 @@ const Settings = () => {
type="number"
value={filterDifficulty}
onChange={e => setFilterDifficulty(e.target.value)}
- min={21}
+ min={22}
className="w-full px-3 py-2 border rounded-md bg-black"
/>
@@ -94,7 +94,7 @@ const Settings = () => {
type="number"
value={difficulty}
onChange={e => setDifficulty(e.target.value)}
- min={21}
+ min={22}
className="w-full px-3 py-2 border rounded-md bg-black"
/>
diff --git a/client/src/config.ts b/client/src/config.ts
index fa207b3..2d0742f 100644
--- a/client/src/config.ts
+++ b/client/src/config.ts
@@ -1 +1 @@
-export const DEFAULT_DIFFICULTY = 21;
\ No newline at end of file
+export const DEFAULT_DIFFICULTY = 22;
\ No newline at end of file
diff --git a/client/src/utils/FileUpload.tsx b/client/src/utils/FileUpload.tsx
deleted file mode 100644
index 2be9544..0000000
--- a/client/src/utils/FileUpload.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import { generateSecretKey, getPublicKey, finalizeEvent } from "nostr-tools";
-import { base64 } from "@scure/base";
-
-export interface UploadResult {
- url?: string;
- error?: string;
-}
-
-const whitelistImageURL = ["nostr.build", "void.cat", "blossom.oxtr"];
-/**
- * Upload file to void.cat
- * https://void.cat/swagger/index.html
- */
-
-export default async function FileUpload(file: File): Promise {
- const sk = generateSecretKey();
- const fileBuffer = await file.arrayBuffer();
- const hashBuffer = await crypto.subtle.digest('SHA-256', fileBuffer);
- const hashArray = Array.from(new Uint8Array(hashBuffer));
- const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
-
- const auth = async () => {
- const authEvent = {
- kind: 24242,
- content: "Upload " + file.name + " from getwired.app",
- tags: [
- ["t", "upload"],
- ["x", hashHex],
- ["expiration", (Math.floor(Date.now() / 1000) + 24 * 60 * 60).toString()]
- ],
- created_at: Math.floor(Date.now() / 1000),
- pubkey: getPublicKey(sk),
- }
- const authString = JSON.stringify(finalizeEvent(authEvent, sk));
- const authBase64 = base64.encode(new TextEncoder().encode(authString));
- return `Nostr ${authBase64}`;
- };
-
- const req = await fetch("https://blossom.oxtr.dev/upload", {
- body: file,
- method: "PUT",
- headers: {
- "authorization": await auth() // Use the encoded authorization header
- },
- });
- if (req.ok) {
- const fileExtension = file.name.split(".").pop(); // Extracting the file extension
- const resultUrl = `https://blossom.oxtr.dev/${hashHex}.${fileExtension}`;
- return { url: resultUrl };
- }
- return {
- error: "Upload failed",
- };
-}
-
-export const renderMedia = (files: string[]) => {
- const gridTemplateColumns = files.length > 1 ? 'repeat(2, 1fr)' : 'repeat(1, 1fr)';
- const gridTemplateRows = files.length > 2 ? 'repeat(2, 1fr)' : 'repeat(1, 1fr)';
-
- // Function to toggle blur on click
- const toggleBlur = (event: React.MouseEvent) => {
- event.currentTarget.classList.toggle('no-blur');
- };
-
- return (
-
- {files.map((file, index) => {
- // Check if the file is from allowed domains
- const isFromAllowedDomain = whitelistImageURL.some(domain => file.includes(domain));
-
- if (file && (file.endsWith(".mp4") || file.endsWith(".webm"))) {
- return (
-
- );
- } else if (!file.includes("http")) {
- return null;
- } else {
- return (
-
- );
- }
- })}
-