16 |
our @EXPORT = qw( |
our @EXPORT = qw( |
17 |
); |
); |
18 |
|
|
19 |
our $VERSION = '0.4'; |
our $VERSION = '0.5'; |
20 |
|
|
21 |
use Class::DBI::Loader; |
use Class::DBI::Loader; |
22 |
use Email::Valid; |
use Email::Valid; |
26 |
use Email::Simple; |
use Email::Simple; |
27 |
use Email::Address; |
use Email::Address; |
28 |
use Mail::DeliveryStatus::BounceParser; |
use Mail::DeliveryStatus::BounceParser; |
29 |
use Data::Dumper; |
use Class::DBI::AbstractSearch; |
|
|
|
|
my $email_send_driver = 'Email::Send::IO'; |
|
|
my @email_send_options; |
|
|
|
|
|
#$email_send_driver = 'Sendmail'; |
|
30 |
|
|
31 |
|
|
32 |
=head1 NAME |
=head1 NAME |
75 |
user => $self->{'user'}, |
user => $self->{'user'}, |
76 |
password => $self->{'passwd'}, |
password => $self->{'passwd'}, |
77 |
namespace => "Nos", |
namespace => "Nos", |
78 |
# additional_classes => qw/Class::DBI::AbstractSearch/, |
additional_classes => qw/Class::DBI::AbstractSearch/, |
79 |
# additional_base_classes => qw/My::Stuff/, |
# additional_base_classes => qw/My::Stuff/, |
80 |
relationships => 1, |
relationships => 1, |
81 |
) || croak "can't init Class::DBI::Loader"; |
) || croak "can't init Class::DBI::Loader"; |
109 |
my $arg = {@_}; |
my $arg = {@_}; |
110 |
|
|
111 |
confess "need list name" unless ($arg->{'list'}); |
confess "need list name" unless ($arg->{'list'}); |
112 |
confess "need list email" unless ($arg->{'list'}); |
confess "need list email" unless ($arg->{'email'}); |
113 |
|
|
114 |
|
$arg->{'list'} = lc($arg->{'list'}); |
115 |
|
$arg->{'email'} = lc($arg->{'email'}); |
116 |
|
|
117 |
my $l = $self->_get_list($arg->{'list'}) || |
my $l = $self->_get_list($arg->{'list'}) || |
118 |
$self->_add_list( @_ ) || |
$self->_add_list( @_ ) || |
130 |
list => "My list", |
list => "My list", |
131 |
email => "john.doe@example.com", |
email => "john.doe@example.com", |
132 |
name => "John A. Doe", |
name => "John A. Doe", |
133 |
|
ext_id => 42, |
134 |
); |
); |
135 |
|
|
136 |
C<name> parametar is optional. |
C<name> and C<ext_id> parametars are optional. |
137 |
|
|
138 |
Return member ID if user is added. |
Return member ID if user is added. |
139 |
|
|
144 |
|
|
145 |
my $arg = {@_}; |
my $arg = {@_}; |
146 |
|
|
147 |
my $email = $arg->{'email'} || croak "can't add user without e-mail"; |
my $email = lc($arg->{'email'}) || croak "can't add user without e-mail"; |
148 |
my $name = $arg->{'name'} || ''; |
my $name = $arg->{'name'} || ''; |
149 |
my $list_name = $arg->{'list'} || croak "need list name"; |
my $list_name = lc($arg->{'list'}) || croak "need list name"; |
150 |
|
my $ext_id = $arg->{'ext_id'}; |
151 |
|
|
152 |
my $list = $self->_get_list($list_name) || croak "list $list_name doesn't exist"; |
my $list = $self->_get_list($list_name) || croak "list $list_name doesn't exist"; |
153 |
|
|
170 |
$this_user->update; |
$this_user->update; |
171 |
} |
} |
172 |
|
|
173 |
|
if (defined($ext_id) && ($this_user->ext_id || '') ne $ext_id) { |
174 |
|
$this_user->ext_id($ext_id); |
175 |
|
$this_user->update; |
176 |
|
} |
177 |
|
|
178 |
my $user_on_list = $user_list->find_or_create({ |
my $user_on_list = $user_list->find_or_create({ |
179 |
user_id => $this_user->id, |
user_id => $this_user->id, |
180 |
list_id => $list->id, |
list_id => $list->id, |
202 |
email => 'dpavlin@rot13.org |
email => 'dpavlin@rot13.org |
203 |
} |
} |
204 |
|
|
205 |
If list is not found, returns false. |
If list is not found, returns false. If there is C<ext_id> in user data, |
206 |
|
that will also be returned. |
207 |
|
|
208 |
=cut |
=cut |
209 |
|
|
212 |
|
|
213 |
my $args = {@_}; |
my $args = {@_}; |
214 |
|
|
215 |
my $list_name = $args->{'list'} || confess "need list name"; |
my $list_name = lc($args->{'list'}) || confess "need list name"; |
216 |
|
|
217 |
my $lists = $self->{'loader'}->find_class('lists'); |
my $lists = $self->{'loader'}->find_class('lists'); |
218 |
my $user_list = $self->{'loader'}->find_class('user_list'); |
my $user_list = $self->{'loader'}->find_class('user_list'); |
227 |
email => $user_on_list->user_id->email, |
email => $user_on_list->user_id->email, |
228 |
}; |
}; |
229 |
|
|
230 |
|
my $ext_id = $user_on_list->user_id->ext_id; |
231 |
|
$row->{'ext_id'} = $ext_id if (defined($ext_id)); |
232 |
|
|
233 |
push @results, $row; |
push @results, $row; |
234 |
} |
} |
235 |
|
|
261 |
|
|
262 |
croak "need name or email of user to delete" unless ($args->{'name'} || $args->{'email'}); |
croak "need name or email of user to delete" unless ($args->{'name'} || $args->{'email'}); |
263 |
|
|
264 |
|
$args->{'email'} = lc($args->{'email'}) if ($args->{'email'}); |
265 |
|
|
266 |
my $key = 'name'; |
my $key = 'name'; |
267 |
$key = 'email' if ($args->{'email'}); |
$key = 'email' if ($args->{'email'}); |
268 |
|
|
270 |
|
|
271 |
my $this_user = $users->search( $key => $args->{$key} )->first || return; |
my $this_user = $users->search( $key => $args->{$key} )->first || return; |
272 |
|
|
|
print Dumper($this_user); |
|
|
|
|
273 |
$this_user->delete || croak "can't delete user\n"; |
$this_user->delete || croak "can't delete user\n"; |
274 |
|
|
275 |
return $users->dbi_commit || croak "can't commit"; |
return $users->dbi_commit || croak "can't commit"; |
276 |
} |
} |
277 |
|
|
278 |
|
=head2 delete_member_from_list |
279 |
|
|
280 |
|
Delete member from particular list. |
281 |
|
|
282 |
|
my $ok = delete_member_from_list( |
283 |
|
list => 'My list', |
284 |
|
email => 'dpavlin@rot13.org', |
285 |
|
); |
286 |
|
|
287 |
|
Returns false if user doesn't exist on that particular list. |
288 |
|
|
289 |
|
It will die if list or user doesn't exist. You have been warned (you might |
290 |
|
want to eval this functon to prevent it from croaking). |
291 |
|
|
292 |
|
=cut |
293 |
|
|
294 |
|
sub delete_member_from_list { |
295 |
|
my $self = shift; |
296 |
|
|
297 |
|
my $args = {@_}; |
298 |
|
|
299 |
|
croak "need list name and email of user to delete" unless ($args->{'list'} && $args->{'email'}); |
300 |
|
|
301 |
|
$args->{'list'} = lc($args->{'list'}); |
302 |
|
$args->{'email'} = lc($args->{'email'}); |
303 |
|
|
304 |
|
my $user = $self->{'loader'}->find_class('users'); |
305 |
|
my $list = $self->{'loader'}->find_class('lists'); |
306 |
|
my $user_list = $self->{'loader'}->find_class('user_list'); |
307 |
|
|
308 |
|
my $this_user = $user->search( email => $args->{'email'} )->first || croak "can't find user: ".$args->{'email'}; |
309 |
|
my $this_list = $list->search( name => $args->{'list'} )->first || croak "can't find list: ".$args->{'list'}; |
310 |
|
|
311 |
|
my $this_user_list = $user_list->search_where( list_id => $this_list->id, user_id => $this_list->id )->first || return; |
312 |
|
|
313 |
|
$this_user_list->delete || croak "can't delete user from list\n"; |
314 |
|
|
315 |
|
return $user_list->dbi_commit || croak "can't commit"; |
316 |
|
} |
317 |
|
|
318 |
=head2 add_message_to_list |
=head2 add_message_to_list |
319 |
|
|
320 |
Adds message to one list's queue for later sending. |
Adds message to one list's queue for later sending. |
340 |
|
|
341 |
my $args = {@_}; |
my $args = {@_}; |
342 |
|
|
343 |
my $list_name = $args->{'list'} || confess "need list name"; |
my $list_name = lc($args->{'list'}) || confess "need list name"; |
344 |
my $message_text = $args->{'message'} || croak "need message"; |
my $message_text = $args->{'message'} || croak "need message"; |
345 |
|
|
346 |
my $m = Email::Simple->new($message_text) || croak "can't parse message"; |
my $m = Email::Simple->new($message_text) || croak "can't parse message"; |
381 |
|
|
382 |
Send queued messages or just ones for selected list |
Send queued messages or just ones for selected list |
383 |
|
|
384 |
$nos->send_queued_messages("My list",'smtp'); |
$nos->send_queued_messages( |
385 |
|
list => 'My list', |
386 |
|
driver => 'smtp', |
387 |
|
sleep => 3, |
388 |
|
); |
389 |
|
|
390 |
Second option is driver which will be used for e-mail delivery. If not |
Second option is driver which will be used for e-mail delivery. If not |
391 |
specified, C<IO> driver will be used which will dump e-mail to C<STDERR>. |
specified, C<IO> driver will be used which will dump e-mail to C<STDERR>. |
400 |
|
|
401 |
=back |
=back |
402 |
|
|
403 |
|
Default sleep wait between two messages is 3 seconds. |
404 |
|
|
405 |
=cut |
=cut |
406 |
|
|
407 |
sub send_queued_messages { |
sub send_queued_messages { |
408 |
my $self = shift; |
my $self = shift; |
409 |
|
|
410 |
my $list_name = shift; |
my $arg = {@_}; |
411 |
|
|
412 |
|
my $list_name = lc($arg->{'list'}) || ''; |
413 |
|
my $driver = $arg->{'driver'} || ''; |
414 |
|
my $sleep = $arg->{'sleep'}; |
415 |
|
$sleep ||= 3 unless defined($sleep); |
416 |
|
|
417 |
my $driver = shift || ''; |
my $email_send_driver = 'Email::Send::IO'; |
418 |
|
my @email_send_options; |
419 |
|
|
420 |
if (lc($driver) eq 'smtp') { |
if (lc($driver) eq 'smtp') { |
421 |
$email_send_driver = 'Email::Send::SMTP'; |
$email_send_driver = 'Email::Send::SMTP'; |
422 |
@email_send_options = ['127.0.0.1']; |
@email_send_options = ['127.0.0.1']; |
423 |
|
} else { |
424 |
|
warn "dumping all messages to STDERR\n"; |
425 |
} |
} |
|
warn "using $driver [$email_send_driver]\n"; |
|
426 |
|
|
427 |
my $lists = $self->{'loader'}->find_class('lists'); |
my $lists = $self->{'loader'}->find_class('lists'); |
428 |
my $queue = $self->{'loader'}->find_class('queue'); |
my $queue = $self->{'loader'}->find_class('queue'); |
463 |
|
|
464 |
my $from_addr; |
my $from_addr; |
465 |
my $from_email_only = $from . "+" . $hash . ( $domain ? '@' . $domain : ''); |
my $from_email_only = $from . "+" . $hash . ( $domain ? '@' . $domain : ''); |
466 |
|
|
467 |
$from_addr .= '"' . $u->list_id->from_addr . '" ' if ($u->list_id->from_addr); |
$from_addr .= '"' . $u->list_id->from_addr . '" ' if ($u->list_id->from_addr); |
468 |
$from_addr .= '<' . $from_email_only . '>'; |
$from_addr .= '<' . $from_email_only . '>'; |
469 |
my $to = '"' . $u->user_id->name . '" <' . $to_email . '>'; |
my $to = '"' . $u->user_id->name . '" <' . $to_email . '>'; |
471 |
my $m_obj = Email::Simple->new($msg) || croak "can't parse message"; |
my $m_obj = Email::Simple->new($msg) || croak "can't parse message"; |
472 |
|
|
473 |
$m_obj->header_set('Return-Path', $from_email_only) || croak "can't set Return-Path: header"; |
$m_obj->header_set('Return-Path', $from_email_only) || croak "can't set Return-Path: header"; |
474 |
$m_obj->header_set('Sender', $from_email_only) || croak "can't set Return-Path: header"; |
$m_obj->header_set('Sender', $from_email_only) || croak "can't set Sender: header"; |
475 |
$m_obj->header_set('Errors-To', $from_email_only) || croak "can't set Return-Path: header"; |
$m_obj->header_set('Errors-To', $from_email_only) || croak "can't set Errors-To: header"; |
476 |
$m_obj->header_set('From', $from_addr) || croak "can't set From: header"; |
$m_obj->header_set('From', $from_addr) || croak "can't set From: header"; |
477 |
$m_obj->header_set('To', $to) || croak "can't set To: header"; |
$m_obj->header_set('To', $to) || croak "can't set To: header"; |
478 |
|
|
492 |
hash => $hash, |
hash => $hash, |
493 |
}); |
}); |
494 |
$sent->dbi_commit; |
$sent->dbi_commit; |
495 |
|
|
496 |
|
if ($sleep) { |
497 |
|
warn "sleeping $sleep seconds\n"; |
498 |
|
sleep($sleep); |
499 |
|
} |
500 |
} |
} |
501 |
} |
} |
502 |
$m->all_sent(1); |
$m->all_sent(1); |
525 |
return unless ($arg->{'message'}); |
return unless ($arg->{'message'}); |
526 |
croak "need list name" unless ($arg->{'list'}); |
croak "need list name" unless ($arg->{'list'}); |
527 |
|
|
528 |
|
$arg->{'list'} = lc($arg->{'list'}); |
529 |
|
|
530 |
my $this_list = $self->_get_list($arg->{'list'}) || croak "can't find list ".$arg->{'list'}."\n"; |
my $this_list = $self->_get_list($arg->{'list'}) || croak "can't find list ".$arg->{'list'}."\n"; |
531 |
|
|
532 |
my $m = Email::Simple->new($arg->{'message'}) || croak "can't parse message"; |
my $m = Email::Simple->new($arg->{'message'}) || croak "can't parse message"; |
533 |
|
|
534 |
my $to = $m->header('To') || die "can't find To: address in incomming message\n"; |
my $to = $m->header('To') || die "can't find To: address in incomming message\n"; |
535 |
|
|
536 |
|
my $return_path = $m->header('Return-Path') || ''; |
537 |
|
|
538 |
my @addrs = Email::Address->parse( $to ); |
my @addrs = Email::Address->parse( $to ); |
539 |
|
|
540 |
die "can't parse To: $to address\n" unless (@addrs); |
die "can't parse To: $to address\n" unless (@addrs); |
544 |
my $hash; |
my $hash; |
545 |
|
|
546 |
foreach my $a (@addrs) { |
foreach my $a (@addrs) { |
547 |
if ($a->address =~ m/\+([a-f0-9]{$hl})@/) { |
if ($a->address =~ m/\+([a-f0-9]{$hl})@/i) { |
548 |
$hash = $1; |
$hash = $1; |
549 |
last; |
last; |
550 |
} |
} |
551 |
} |
} |
552 |
|
|
553 |
croak "can't find hash in e-mail $to\n" unless ($hash); |
#warn "can't find hash in e-mail $to\n" unless ($hash); |
554 |
|
|
555 |
my $sent = $self->{'loader'}->find_class('sent'); |
my $sent = $self->{'loader'}->find_class('sent'); |
556 |
|
|
557 |
# will use null if no matching message_id is found |
# will use null if no matching message_id is found |
558 |
my $sent_msg = $sent->search( hash => $hash )->first; |
my $sent_msg; |
559 |
|
$sent_msg = $sent->search( hash => $hash )->first if ($hash); |
560 |
|
|
561 |
my ($message_id, $user_id) = (undef, undef); # init with NULL |
my ($message_id, $user_id) = (undef, undef); # init with NULL |
562 |
|
|
564 |
$message_id = $sent_msg->message_id || carp "no message_id"; |
$message_id = $sent_msg->message_id || carp "no message_id"; |
565 |
$user_id = $sent_msg->user_id || carp "no user_id"; |
$user_id = $sent_msg->user_id || carp "no user_id"; |
566 |
} else { |
} else { |
567 |
warn "can't find sender with hash $hash\n"; |
#warn "can't find sender with hash $hash\n"; |
568 |
|
my $users = $self->{'loader'}->find_class('users'); |
569 |
|
my $from = $m->header('From'); |
570 |
|
$from = $1 if ($from =~ m/<(.*)>/); |
571 |
|
my $this_user = $users->search( email => lc($from) )->first; |
572 |
|
$user_id = $this_user->id if ($this_user); |
573 |
} |
} |
574 |
|
|
575 |
|
|
576 |
my $is_bounce = 0; |
my $is_bounce = 0; |
577 |
|
|
578 |
{ |
if ($return_path eq '<>' || $return_path eq '') { |
579 |
no warnings; |
no warnings; |
580 |
my $bounce = eval { Mail::DeliveryStatus::BounceParser->new( |
my $bounce = eval { Mail::DeliveryStatus::BounceParser->new( |
581 |
$arg->{'message'}, { report_non_bounces=>1 }, |
$arg->{'message'}, { report_non_bounces=>1 }, |
582 |
) }; |
) }; |
583 |
carp "can't check if this message is bounce!" if ($@); |
#warn "can't check if this message is bounce!" if ($@); |
584 |
|
|
585 |
$is_bounce++ if ($bounce && $bounce->is_bounce); |
$is_bounce++ if ($bounce && $bounce->is_bounce); |
586 |
} |
} |
597 |
|
|
598 |
$this_received->dbi_commit; |
$this_received->dbi_commit; |
599 |
|
|
600 |
print "message_id: ",($message_id || "not found")," -- $is_bounce\n"; |
# print "message_id: ",($message_id || "not found")," -- $is_bounce\n"; |
|
|
|
|
|
|
|
warn "inbox is not yet implemented"; |
|
601 |
} |
} |
602 |
|
|
603 |
|
|
629 |
|
|
630 |
my $arg = {@_}; |
my $arg = {@_}; |
631 |
|
|
632 |
my $name = $arg->{'list'} || confess "can't add list without name"; |
my $name = lc($arg->{'list'}) || confess "can't add list without name"; |
633 |
my $email = $arg->{'email'} || confess "can't add list without e-mail"; |
my $email = lc($arg->{'email'}) || confess "can't add list without e-mail"; |
634 |
my $from_addr = $arg->{'from'}; |
my $from_addr = $arg->{'from'}; |
635 |
|
|
636 |
my $lists = $self->{'loader'}->find_class('lists'); |
my $lists = $self->{'loader'}->find_class('lists'); |
671 |
|
|
672 |
my $lists = $self->{'loader'}->find_class('lists') || confess "can't find lists class"; |
my $lists = $self->{'loader'}->find_class('lists') || confess "can't find lists class"; |
673 |
|
|
674 |
return $lists->search({ name => $name })->first; |
return $lists->search({ name => lc($name) })->first; |
675 |
} |
} |
676 |
|
|
677 |
### |
### |
713 |
|
|
714 |
$message_id = NewList( |
$message_id = NewList( |
715 |
list => 'My list', |
list => 'My list', |
716 |
|
from => 'Name of my list', |
717 |
email => 'my-list@example.com' |
email => 'my-list@example.com' |
718 |
); |
); |
719 |
|
|
724 |
|
|
725 |
if ($_[0] !~ m/^HASH/) { |
if ($_[0] !~ m/^HASH/) { |
726 |
return $nos->new_list( |
return $nos->new_list( |
727 |
list => $_[0], email => $_[1], |
list => $_[0], from => $_[1], email => $_[2], |
728 |
); |
); |
729 |
} else { |
} else { |
730 |
return $nos->new_list( %{ shift @_ } ); |
return $nos->new_list( %{ shift @_ } ); |
737 |
$member_id = AddMemberToList( |
$member_id = AddMemberToList( |
738 |
list => 'My list', |
list => 'My list', |
739 |
email => 'e-mail@example.com', |
email => 'e-mail@example.com', |
740 |
name => 'Full Name' |
name => 'Full Name', |
741 |
|
ext_id => 42, |
742 |
); |
); |
743 |
|
|
744 |
=cut |
=cut |
748 |
|
|
749 |
if ($_[0] !~ m/^HASH/) { |
if ($_[0] !~ m/^HASH/) { |
750 |
return $nos->add_member_to_list( |
return $nos->add_member_to_list( |
751 |
list => $_[0], email => $_[1], name => $_[2], |
list => $_[0], email => $_[1], name => $_[2], ext_id => $_[4], |
752 |
); |
); |
753 |
} else { |
} else { |
754 |
return $nos->add_member_to_list( %{ shift @_ } ); |
return $nos->add_member_to_list( %{ shift @_ } ); |