my $to = shift;
my @date = $self->unixtoj(shift);
my $pattern = shift;
+ my $who = uc shift;
my $search;
my @in;
my @out;
my $eval;
my $count;
- $search = $pattern ? "\$ref->[1] =~ /$pattern/" : '1' ;
+ $search = '1' unless $pattern || $who;
+ $search = "\$ref->[1] =~ /$pattern/" if $pattern;
+ $search .= ' && ' if $pattern && $who;
+ $search .= "(\$ref->[2] =~ /$who/ || \$ref->[3] =~ /$who/)" if $who;
$eval = qq(
my \$c;
my \$ref;
} elsif ($ref[1] eq 'talk') {
$s = "$ref[3] -> $ref[2] ($ref[4]) $ref[5]";
} elsif ($ref[1] eq 'ann') {
- $s = "$ref[2] -> $ref[3] $ref[4]";
+ $s = "$ref[3] -> $ref[2] $ref[4]";
} else {
$s = "$ref[2]";
}