@@ -40,7 +30,7 @@
: "-"}
- {#if hop.with || hop.id || hop.from}
+ {#if hop.with || hop.id}
{#if hop.with}
diff --git a/web/src/lib/components/HeaderAnalysisCard.svelte b/web/src/lib/components/HeaderAnalysisCard.svelte
index 73c39e8..b26b492 100644
--- a/web/src/lib/components/HeaderAnalysisCard.svelte
+++ b/web/src/lib/components/HeaderAnalysisCard.svelte
@@ -11,7 +11,7 @@
headerScore?: number;
}
- let { dmarcRecord, headerAnalysis, headerGrade, headerScore }: Props = $props();
+ let { dmarcRecord, headerAnalysis, headerGrade, headerScore, xAlignedFrom }: Props = $props();
diff --git a/web/src/lib/components/HistoryTable.svelte b/web/src/lib/components/HistoryTable.svelte
deleted file mode 100644
index 737d025..0000000
--- a/web/src/lib/components/HistoryTable.svelte
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
- | Grade |
- Score |
- Domain |
- Date |
- |
-
-
-
- {#each tests as test}
- goto(`/test/${test.test_id}`)}>
- |
-
- |
-
- {test.score}%
- |
-
- {#if test.from_domain}
- {test.from_domain}
- {:else}
- -
- {/if}
- |
-
- {formatDate(test.created_at)}
- |
-
-
- |
-
- {/each}
-
-
-
-
-
diff --git a/web/src/lib/components/PtrForwardRecordsDisplay.svelte b/web/src/lib/components/PtrForwardRecordsDisplay.svelte
index 8ed723b..77ce6c8 100644
--- a/web/src/lib/components/PtrForwardRecordsDisplay.svelte
+++ b/web/src/lib/components/PtrForwardRecordsDisplay.svelte
@@ -21,11 +21,6 @@
);
const hasForwardRecords = $derived(ptrForwardRecords && ptrForwardRecords.length > 0);
-
- let showDifferent = $state(false);
- const differentCount = $derived(
- ptrForwardRecords ? ptrForwardRecords.filter((ip) => ip !== senderIp).length : 0,
- );
{#if ptrRecords && ptrRecords.length > 0}
@@ -68,31 +63,15 @@
Forward Resolution (A/AAAA):
{#each ptrForwardRecords as ip}
- {#if ip === senderIp || !fcrDnsIsValid || showDifferent}
-
- {#if senderIp && ip === senderIp}
- Match
- {:else}
- Different
- {/if}
- {ip}
-
- {/if}
- {/each}
- {#if fcrDnsIsValid && differentCount > 0}
-
-
+
+ {#if senderIp && ip === senderIp}
+ Match
+ {:else}
+ Different
+ {/if}
+ {ip}
- {/if}
+ {/each}
{#if fcrDnsIsValid}
diff --git a/web/src/lib/components/RspamdCard.svelte b/web/src/lib/components/RspamdCard.svelte
deleted file mode 100644
index 4c2795b..0000000
--- a/web/src/lib/components/RspamdCard.svelte
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
-
-
-
- Score:
-
- {rspamd.score.toFixed(2)} / {rspamd.threshold.toFixed(1)}
-
-
-
- Classified as:
-
- {rspamd.is_spam ? "SPAM" : "HAM"}
-
-
-
- Action:
-
- {effectiveAction.label}
-
-
-
-
- {#if rspamd.symbols && Object.keys(rspamd.symbols).length > 0}
-
-
-
-
-
- | Symbol |
- Score |
- Description |
-
-
-
- {#each Object.entries(rspamd.symbols).sort(([, a], [, b]) => b.score - a.score) as [symbolName, symbol]}
- 0
- ? "table-warning"
- : symbol.score < 0
- ? "table-success"
- : ""}
- >
- |
- {symbolName}
- {#if symbol.params}
-
- {symbol.params}
-
- {/if}
- |
-
- 0
- ? "text-danger fw-bold"
- : symbol.score < 0
- ? "text-success fw-bold"
- : "text-muted"}
- >
- {symbol.score > 0 ? "+" : ""}{symbol.score.toFixed(2)}
-
- |
- {symbol.description ?? ""} |
-
- {/each}
-
-
-
-
- {/if}
-
- {#if rspamd.report}
-
- Raw Report
- {rspamd.report}
-
- {/if}
-
-
-
-
diff --git a/web/src/lib/components/SpamAssassinCard.svelte b/web/src/lib/components/SpamAssassinCard.svelte
index cc88c23..2da105e 100644
--- a/web/src/lib/components/SpamAssassinCard.svelte
+++ b/web/src/lib/components/SpamAssassinCard.svelte
@@ -6,9 +6,11 @@
interface Props {
spamassassin: SpamAssassinResult;
+ spamGrade?: string;
+ spamScore?: number;
}
- let { spamassassin }: Props = $props();
+ let { spamassassin, spamGrade, spamScore }: Props = $props();
@@ -19,13 +21,13 @@
SpamAssassin Analysis
- {#if spamassassin.deliverability_score !== undefined}
-
- {spamassassin.deliverability_score}%
+ {#if spamScore !== undefined}
+
+ {spamScore}%
{/if}
- {#if spamassassin.deliverability_grade !== undefined}
-
+ {#if spamGrade !== undefined}
+
{/if}
diff --git a/web/src/lib/components/SummaryCard.svelte b/web/src/lib/components/SummaryCard.svelte
index 518e996..199bc94 100644
--- a/web/src/lib/components/SummaryCard.svelte
+++ b/web/src/lib/components/SummaryCard.svelte
@@ -25,32 +25,16 @@
// Email sender information
const mailFrom = report.header_analysis?.headers?.from?.value || "an unknown sender";
- const hasDkim =
- report.dns_results?.dkim_records && report.dns_results?.dkim_records?.length > 0;
- const dkimPassed =
- report.authentication?.dkim &&
- report.authentication?.dkim.length > 0 &&
- report.authentication?.dkim?.some((d) => d.result === "pass");
+ const hasDkim = report.authentication?.dkim && report.authentication?.dkim.length > 0;
+ const dkimPassed = hasDkim && report.authentication?.dkim?.some((d) => d.result === "pass");
segments.push({ text: "Received a " });
segments.push({
- text: hasDkim ? "DKIM-signed" : "non-DKIM-signed",
- highlight: {
- color: hasDkim ? (dkimPassed ? "good" : "warning") : "danger",
- bold: true,
- },
- link: hasDkim && dkimPassed ? "#authentication-dkim" : "#dns-details",
+ text: dkimPassed ? "DKIM-signed" : "non-DKIM-signed",
+ highlight: { color: dkimPassed ? "good" : "danger", bold: true },
+ link: "#authentication-dkim",
});
- segments.push({ text: " email" });
- if (hasDkim && !dkimPassed) {
- segments.push({ text: " with " });
- segments.push({
- text: "an invalid signature",
- highlight: { color: "danger", bold: true },
- link: "#authentication-dkim",
- });
- }
- segments.push({ text: " from " });
+ segments.push({ text: " email from " });
segments.push({
text: mailFrom,
highlight: { emphasis: true },
@@ -129,7 +113,7 @@
} else if (spfResult === "temperror" || spfResult === "permerror") {
segments.push({
text: "encountered an error",
- highlight: { color: "danger", bold: true },
+ highlight: { color: "warning", bold: true },
link: "#authentication-spf",
});
segments.push({ text: ", check your SPF record configuration" });
@@ -347,7 +331,7 @@
highlight: { color: "good", bold: true },
link: "#dns-bimi",
});
- if (bimiResult?.details && bimiResult.details.indexOf("declined") == 0) {
+ if (bimiResult.details && bimiResult.details.indexOf("declined") == 0) {
segments.push({ text: " declined to participate" });
} else if (bimiResult?.result === "fail") {
segments.push({ text: " but " });
@@ -438,17 +422,6 @@
});
}
- // One-click unsubscribe check
- const unsubscribeMethods = report.content_analysis?.unsubscribe_methods;
- if (unsubscribeMethods && unsubscribeMethods.length > 0 && !unsubscribeMethods.includes("one-click")) {
- segments.push({ text: ". This email could benefit from " });
- segments.push({
- text: "one-click unsubscribe",
- highlight: { color: "warning", bold: true },
- link: "#content-details",
- });
- }
-
// Content/spam assessment
const spamAssassin = report.spamassassin;
const contentScore = report.summary?.content_score || 0;
diff --git a/web/src/lib/components/WhitelistCard.svelte b/web/src/lib/components/WhitelistCard.svelte
deleted file mode 100644
index 13fd86b..0000000
--- a/web/src/lib/components/WhitelistCard.svelte
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
- DNS whitelists identify trusted senders. Being listed here is a positive signal, but has
- no impact on the overall score.
-
-
-
- {#each Object.entries(whitelists) as [ip, checks]}
-
-
-
- {ip}
-
-
-
- {#each checks as check}
-
- |
-
- {check.error
- ? "Error"
- : check.listed
- ? "Listed"
- : "Not listed"}
-
- |
- {check.rbl} |
-
- {/each}
-
-
-
- {/each}
-
-
-
+
Open-Source Email Deliverability Tester
diff --git a/web/src/routes/+page.svelte b/web/src/routes/+page.svelte
index b9259fe..7c23d10 100644
--- a/web/src/routes/+page.svelte
+++ b/web/src/routes/+page.svelte
@@ -1,30 +1,12 @@
-
-
- Test History - happyDeliver
-
-
-
-
-
-
-
-
- Test History
-
-
-
-
- {#if loading}
-
-
- Loading...
-
-
Loading tests...
-
- {:else if error}
-
-
- {error}
-
- {:else if tests.length === 0}
-
-
-
No tests yet
-
- Send a test email to get your first deliverability
- report.
-
-
-
- {:else}
-
-
-
- {#if totalPages > 1}
-
- {/if}
- {/if}
-
-
-
diff --git a/web/src/routes/test/[test]/+page.svelte b/web/src/routes/test/[test]/+page.svelte
index 113209d..bf44d20 100644
--- a/web/src/routes/test/[test]/+page.svelte
+++ b/web/src/routes/test/[test]/+page.svelte
@@ -3,26 +3,21 @@
import { onDestroy } from "svelte";
import { getReport, getTest, reanalyzeReport } from "$lib/api";
- import type { BlacklistCheck, Report, Test } from "$lib/api/types.gen";
+ import type { Report, Test } from "$lib/api/types.gen";
import {
AuthenticationCard,
BlacklistCard,
ContentAnalysisCard,
DnsRecordsCard,
- EmailPathCard,
ErrorDisplay,
HeaderAnalysisCard,
PendingState,
- RspamdCard,
ScoreCard,
SpamAssassinCard,
SummaryCard,
TinySurvey,
- WhitelistCard,
} from "$lib/components";
- type BlacklistRecords = Record
;
-
let testId = $derived(page.params.test);
let test = $state(null);
let report = $state(null);
@@ -295,15 +290,6 @@
@@ -334,45 +320,17 @@
{/if}
- {#snippet blacklistChecks(blacklists: BlacklistRecords, report: Report)}
-
- {/snippet}
-
-
- {#snippet whitelistChecks(whitelists: BlacklistRecords)}
-
- {/snippet}
-
-
- {#if report.blacklists && report.whitelists && Object.keys(report.blacklists).length == 1 && Object.keys(report.whitelists).length == 1}
-
-
- {@render blacklistChecks(report.blacklists, report)}
-
-
- {@render whitelistChecks(report.whitelists)}
+ {#if report.blacklists && Object.keys(report.blacklists).length > 0}
+
- {:else}
- {#if report.blacklists && Object.keys(report.blacklists).length > 0}
-
-
- {@render blacklistChecks(report.blacklists, report)}
-
-
- {/if}
-
- {#if report.whitelists && Object.keys(report.whitelists).length > 0}
-
-
- {@render whitelistChecks(report.whitelists)}
-
-
- {/if}
{/if}
@@ -389,19 +347,16 @@
{/if}
-
- {#if report.spamassassin || report.rspamd}
+
+ {#if report.spamassassin}
- {#if report.spamassassin}
-
-
-
- {/if}
- {#if report.rspamd}
-
-
-
- {/if}
+
+
+
{/if}