SMS aliasing rewritten

[PerlMail.git] / My-Audit.pm

diff --git a/My-Audit.pm b/My-Audit.pm
index 781288d..9f02c70 100644 (file)
--- a/My-Audit.pm
+++ b/My-Audit.pm
@@ -156,15 +156,31 @@ sub audit
        store "==","sms"             if !did;
 }
 
+sub audit_sms_address
+{
+my($obj)=@_;
+
+       my $address=$obj->address();
+       if (my $alternates=muttrc_get("alternates")) {
+               return "I" if $address=~/$alternates/si;
+               }
+       my %aliases=muttrc_aliases();
+       if (my $alias=$aliases{lc $address}) {
+               local $_=$alias;
+               s/\.cz$//i;
+               return $_;
+               }
+       local $_=$address;
+       s/\b(Bus)siness$/$1/i;
+       s/\.ident$//i;
+       return $_;
+}
+
 sub audit_sms
 {
 my(%args)=@_;
 
-       my $from=(@{$args{"from"}} ? join(",",map({
-                       s/\.cz$//i;
-                       s/\b(Bus)siness$/$1/i;
-                       $_;
-                       } @{$args{"from"}})) : "?");
+       my $from=(@{$args{"from"}} ? join(",",map({ audit_sms_address($_); } @{$args{"from"}})) : "?");
        local $_;
 
        $_=$args{"subject"};