fix: added indexing to recipient search for aliases

forwardemail · Feb 22, 2024 · 5d74e68 · 5d74e68
1 parent 95e493b
commit 5d74e68
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/app/controllers/web/my-account/retrieve-aliases.js b/app/controllers/web/my-account/retrieve-aliases.js
@@ -22,9 +22,22 @@ async function retrieveAliases(ctx, next) {
 
   if (isSANB(ctx.query.q)) {
     if (ctx.state.domain.is_catchall_regex_disabled) {
-      query.$and.push({
-        name: ctx.query.q.split('@')[0].trim().toLowerCase()
-      });
+      if (isEmail(ctx.query.q)) {
+        query.$and.push({
+          $or: [
+            {
+              name: ctx.query.q.split('@')[0].trim().toLowerCase()
+            },
+            {
+              recipients: ctx.query.q.trim().toLowerCase()
+            }
+          ]
+        });
+      } else {
+        query.$and.push({
+          name: ctx.query.q.split('@')[0].trim().toLowerCase()
+        });
+      }
     } else {
       query.$and.push({
         $or: [

diff --git a/app/models/aliases.js b/app/models/aliases.js
@@ -208,6 +208,7 @@ const Aliases = new mongoose.Schema({
   ],
   recipients: [
     {
+      index: true,
       type: String,
       trim: true,
       // must be IP or FQDN or email