Changeset edd0be7 for perl/lib/BarnOwl/Message/Zephyr.pm

Timestamp:

Feb 10, 2011, 9:10:56 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

7488f27

Parents:

3f82515

git-author:

David Benjamin <davidben@mit.edu> (02/05/11 21:31:27)

git-committer:

David Benjamin <davidben@mit.edu> (02/10/11 21:10:56)

Message:

Only handle CCs in messages sent directly to you.

A zephyr with a CC line received on @SOME-REALM would still handle the
CC logic in replycmd. This oddity could possibly be retrofited to allow
@SOME-REALM to participate in CC'd messages, but that would require us
to handle CC lines on messages received on *. In the meantime, let's not
leave a half-baked not-feature.

Also refactor the block slightly. The original formulation is confusing;
it means to condition on the recipient of the message we reply to, but
actually checks $to, the recipient we use in the reply. It just happens
that in one case, the two are equal. The original code would assume that
case and then change its mind if it was wrong.

File:

• perl/lib/BarnOwl/Message/Zephyr.pm (modified) (1 diff)

perl/lib/BarnOwl/Message/Zephyr.pm

@@ -171 +171 @@
         $class = $self->class;
         $instance = $self->instance;
-        $to = $self->recipient;
-        $cc = $self->zephyr_cc();
-        if($to eq '*' || $to eq '') {
+        if ($self->recipient eq '*' || $self->recipient eq '') {
             $to = '';
-        } elsif($to !~ /^@/) {
+        } elsif ($self->recipient =~ /^@/) {
+            $to = $self->recipient;
+        } else {
             $to = $self->sender;
+            $cc = $self->zephyr_cc();
         }
     }