Postal/Zero
1
0
Fork 0
mirror of https://github.com/Mail-0/Zero.git synced 2026-07-01 08:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Error handling

Browse Source
This commit is contained in:
Dante Issaias
2025-03-16 22:54:01 +00:00
parent f9c32460f7
commit 2a5e333cb3
2 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
apps/mail/components/mail/mail-display.tsx
View File

@@ -9,7 +9,15 @@ import {
DialogPortal,
DialogClose,
} from "../ui/dialog";
import { BellOff, Check, ChevronDown, Download, ExternalLink, Lock } from "lucide-react";
import {
BellOff,
Check,
ChevronDown,
Download,
ExternalLink,
LoaderCircleIcon,
Lock,
} from "lucide-react";
import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";
import { Avatar, AvatarFallback, AvatarImage } from "../ui/avatar";
import { getListUnsubscribeAction } from "@/lib/email-utils";
@@ -27,6 +35,7 @@ import { Button } from "../ui/button";
import { format } from "date-fns";
import { cn } from "@/lib/utils";
import Image from "next/image";
import { toast } from "sonner";
const StreamingText = ({ text }: { text: string }) => {
const [displayText, setDisplayText] = useState("");
@@ -118,6 +127,7 @@ const MailDisplay = ({ emailData, isMuted, index, demo }: Props) => {
}, [index]);
const [unsubscribed, setUnsubscribed] = useState(false);
const [isUnsubscribing, setIsUnsubscribing] = useState(false);
const listUnsubscribeAction = useMemo(() => {
if (!emailData?.listUnsubscribe) return null;
@@ -158,8 +168,15 @@ const MailDisplay = ({ emailData, isMuted, index, demo }: Props) => {
{listUnsubscribeAction && (
<Dialog>
<DialogTrigger asChild>
<Button size="xs" variant="secondary" disabled={unsubscribed}>
<Button
size="xs"
variant="secondary"
disabled={unsubscribed || isUnsubscribing}
>
{unsubscribed && <Check className="h-4 w-4" />}
{isUnsubscribing && (
<LoaderCircleIcon className="h-4 w-4 animate-spin" />
)}
{unsubscribed
? t("common.mailDisplay.unsubscribed")
: t("common.mailDisplay.unsubscribe")}
@@ -181,31 +198,46 @@ const MailDisplay = ({ emailData, isMuted, index, demo }: Props) => {
</DialogClose>
<DialogClose asChild>
<Button
onClick={() => {
onClick={async () => {
switch (listUnsubscribeAction.type) {
case "get":
window.open(listUnsubscribeAction.url, "_blank");
break;
case "post":
fetch(listUnsubscribeAction.url, {
mode: "no-cors",
method: "POST",
headers: {
"content-type": "application/x-www-form-urlencoded",
},
body: listUnsubscribeAction.body,
});
setUnsubscribed(true);
setIsUnsubscribing(true);
try {
const res = await fetch(listUnsubscribeAction.url, {
method: "POST",
headers: {
"content-type": "application/x-www-form-urlencoded",
},
body: listUnsubscribeAction.body,
});
if (!res.ok) {
throw new Error("Unsubscribe failed");
}
setIsUnsubscribing(false);
setUnsubscribed(true);
} catch {
setIsUnsubscribing(false);
toast.error(t("common.mailDisplay.failedToUnsubscribe"));
}
break;
case "email":
sendEmail({
to: listUnsubscribeAction.emailAddress,
subject: listUnsubscribeAction.subject,
message:
"Zero sent this email to unsubscribe from this mailing list.",
attachments: [],
});
setUnsubscribed(true);
try {
setIsUnsubscribing(true);
await sendEmail({
to: listUnsubscribeAction.emailAddress,
subject: listUnsubscribeAction.subject,
message:
"Zero sent this email to unsubscribe from this mailing list.",
attachments: [],
});
setUnsubscribed(true);
} catch {
setIsUnsubscribing(false);
toast.error(t("common.mailDisplay.failedToUnsubscribe"));
}
break;
}
}}

3
apps/mail/locales/en.json
View File

@@ -107,7 +107,8 @@
"unsubscribeDescription": "Are you sure you want to unsubscribe from this mailing list?",
"unsubscribeOpenSiteDescription": "To stop getting messages from this mailing list, go to their website to unsubscribe.",
"cancel": "Cancel",
"goToWebsite": "Go to website"
"goToWebsite": "Go to website",
"failedToUnsubscribe": "Failed to unsubscribe from mailing list"
},
"threadDisplay": {
"exitFullscreen": "Exit fullscreen",