Merge pull request #1658 from shadow-dot-cat/castaway/1609_allowlist_…

…button feat(mailviewer): New allowlist sender option for mail viewer
runbox · Feb 5, 2025 · fc9f9d8 · fc9f9d8
2 parents 564feb9 + 56047ab
commit fc9f9d8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/app/mailviewer/rmm7messageactions.ts b/src/app/mailviewer/rmm7messageactions.ts
@@ -210,6 +210,18 @@ export class RMM7MessageActions implements MessageActions {
         snackBarRef.dismiss();
     }
 
+    allowListSender(param) {
+        const msg = `AllowListing sender: ${param}`;
+        const snackBarRef = this.snackBar.open(msg);
+        this.rmmapi.allowListSender(param).subscribe((res) => {
+          if ( res.status === 'error' ) {
+            snackBarRef.dismiss();
+            this.snackBar.open('There was an error with Sender allowlisting functionality. Please try again.', 'Dismiss');
+          }
+        });
+        snackBarRef.dismiss();
+    }
+
     // Update mailviewer menu flag icon after flagging?
     flag() {
         this.updateMessages({

diff --git a/src/app/mailviewer/singlemailviewer.component.html b/src/app/mailviewer/singlemailviewer.component.html
@@ -63,7 +63,7 @@
           <mat-icon svgIcon="alert-octagon-outline"></mat-icon>
         </button>
       </ng-container>
-      <button mat-icon-button *ngIf="morebuttonindex>8" matTooltip="Block Sender/Domain" [matMenuTriggerFor]="blockSenderMenu">
+      <button mat-icon-button *ngIf="morebuttonindex>8" matTooltip="Block/Allow Sender" [matMenuTriggerFor]="senderRulesMenu">
         <mat-icon svgIcon="filter-cog"></mat-icon>
       </button>
       <a *ngIf="morebuttonindex>9" mat-icon-button
@@ -81,7 +81,10 @@
         <mat-icon svgIcon="dots-vertical"></mat-icon>
       </button>
 
-      <mat-menu #blockSenderMenu>
+      <mat-menu #senderRulesMenu>
+        <button mat-menu-item (click)="messageActionsHandler.allowListSender(mailObj.from[0].address)">
+          AllowList Sender
+        </button>
         <button mat-menu-item (click)="messageActionsHandler.blockSender(mailObj.from[0].address)">
           Block Sender Email
         </button>

diff --git a/src/app/rmmapi/rbwebmail.ts b/src/app/rmmapi/rbwebmail.ts
@@ -535,8 +535,12 @@ export class RunboxWebmailAPI {
         return this.http.post('/rest/v1/spam/', JSON.stringify(params));
     }
 
+    public allowListSender(param): Observable<any> {
+        return this.http.post('/rest/v1/rules/update_nospam_list', JSON.stringify({'email_addresses': [param]}));
+    }
+
     public blockSender(param): Observable<any> {
-      return this.http.post('/rest/v1/rules/block_sender', JSON.stringify({'sender': param}));
+        return this.http.post('/rest/v1/rules/block_sender', JSON.stringify({'sender': param}));
     }
 
     // Moves to Trash if not already in Trash