fix: fixed pgp subject and message, updated bounce info

forwardemail · Dec 11, 2024 · 875de2b · 875de2b
1 parent c689e9a
commit 875de2b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/app/controllers/api/v1/lookup.js b/app/controllers/api/v1/lookup.js
@@ -563,13 +563,13 @@ async function lookup(ctx) {
           const subject = i18n.translate(
             'MULTIPLE_PGP_SUBJECT',
             obj.locale,
-            username
+            `${username}@${domain.name}`
           );
           const message = i18n.translate(
             'MULTIPLE_PGP_MESSAGE',
             obj.locale,
             domain.name,
-            username
+            `${username}@${domain.name}`
           );
           await email({
             template: 'alert',

diff --git a/helpers/get-bounce-info.js b/helpers/get-bounce-info.js
@@ -271,14 +271,16 @@ function getBounceInfo(err) {
       response.includes('blacklisted') ||
       response.includes('blocklisted')) &&
     response.includes(IP_ADDRESS)
-  )
+  ) {
     // <https://sender.office.com/> <-- submit request here
     // <https://sendersupport.olc.protection.outlook.com/pm/>
     bounceInfo.category = 'blocklist';
-  //
-  // dmarc failures shouldn't occur since we check them on our side
-  //
-  else if (bounceInfo.category === 'dmarc') bounceInfo.action = 'defer';
+  } else if (response.includes('unusual rate of mail')) {
+    bounceInfo.category = 'spam';
+    //
+    // dmarc failures shouldn't occur since we check them on our side
+    //
+  } else if (bounceInfo.category === 'dmarc') bounceInfo.action = 'defer';
   else if (
     REGEX_DENYLIST.test(response) ||
     REGEX_BLACKLIST.test(response) ||