--- trunk/Nos.pm	2005/05/15 22:30:54	24
+++ trunk/Nos.pm	2005/05/16 20:58:44	29
@@ -16,12 +16,15 @@
 our @EXPORT = qw( 
 );
 
-our $VERSION = '0.1';
+our $VERSION = '0.3';
 
 use Class::DBI::Loader;
 use Email::Valid;
 use Email::Send;
 use Carp;
+use Email::Auth::AddressHash;
+use Email::Simple;
+use Data::Dumper;
 
 =head1 NAME
 
@@ -85,7 +88,7 @@
 
 C<name> parametar is optional.
 
-Return true if user is added.
+Return member ID if user is added.
 
 =cut
 
@@ -99,11 +102,11 @@
 	confess "need list name" unless ($arg->{'list'});
 
 	if (! Email::Valid->address($email)) {
-		warn "SKIPPING $name <$email>";
+		carp "SKIPPING $name <$email>\n" if ($self->{'verbose'});
 		return 0;
 	}
 
-	print "# $name <$email>\n";
+	carp "# $name <$email>\n" if ($self->{'verbose'});
 
 	my $lists = $self->{'loader'}->find_class('lists');
 	my $users = $self->{'loader'}->find_class('users');
@@ -127,14 +130,14 @@
 	$this_user->dbi_commit;
 	$user_on_list->dbi_commit;
 
-	return 1;
+	return $this_user->id;
 }
 
-=head2 add_message_to_queue
+=head2 add_message_to_list
 
 Adds message to one list's queue for later sending.
 
- $nos->add_message_to_queue(
+ $nos->add_message_to_list(
  	list => 'My list',
  	message => 'From: My list <mylist@example.com>
  To: John A. Doe <john.doe@example.com>
@@ -147,7 +150,7 @@
 
 =cut
 
-sub add_message_to_queue {
+sub add_message_to_list {
 	my $self = shift;
 
 	my $args = {@_};
@@ -155,6 +158,12 @@
 	my $list_name = $args->{'list'} || confess "need list name";
 	my $message_text = $args->{'message'} || croak "need message";
 
+	warn Dumper($message_text);
+
+	my $m = Email::Simple->new($message_text) || croak "can't parse message";
+
+	croak "message doesn't have Subject header\n" unless( $m->header('Subject') );
+
 	my $lists = $self->{'loader'}->find_class('lists');
 
 	my $this_list = $lists->search(
@@ -216,18 +225,34 @@
 		print "sending message ",$m->message_id," enqueued on ",$m->date," to list ",$m->list_id->name,"\n";
 		my $msg = $m->message_id->message;
 
+		my $auth = Email::Auth::AddressHash->new(
+			$m->list_id->name,	# secret
+			10,			# hashlen
+		);
+
 		foreach my $u ($user_list->search(list_id => $m->list_id)) {
 
+			my $to_email = $u->user_id->email;
+
 			if ($sent->search( message_id => $m->message_id, user_id => $u->user_id )) {
-				print "SKIP ",$u->user_id->email," message allready sent\n";
+				print "SKIP $to_email message allready sent\n";
 			} else {
-				print "\t",$u->user_id->email,"\n";
+				print "\t$to_email\n";
+
+				my $hash = $auth->generate_hash( $to_email );
 
-				my $hdr = "From: " . $u->list_id->name . " <" . $u->list_id->email . ">\n" .
-					"To: " . $u->user_id->full_name . " <". $u->user_id->email. ">\n";
+				my $from = $u->list_id->name . " <" . $u->list_id->email . "+" . $hash . ">";
+				my $to = $u->user_id->full_name . " <$to_email>";
+
+				my $m = Email::Simple->new($msg) || croak "can't parse message";
+
+				print Dumper($m);
+
+				$m->header_set('From', $from) || croak "can't set From: header";
+				$m->header_set('To', $to) || croak "can't set To: header";
 
 				# FIXME do real sending :-)
-				send IO => "$hdr\n$msg";
+				send IO => $m->as_string;
 
 				$sent->create({
 					message_id => $m->message_id,
@@ -243,18 +268,38 @@
 
 }
 
-=head2 EXPORT
+=head2 inbox_message
 
-None by default.
+Receive single message for list's inbox.
+
+ my $ok = $nos->inbox_message($message);
+
+=cut
+
+sub inbox_message {
+	my $self = shift;
+
+	my $message = shift || return;
+
+	my $m = new Email::Simple->new($message);
+
+}
+
+
+=head1 EXPORT
+
+Nothing.
 
 =head1 SEE ALSO
 
 mailman, ezmlm, sympa, L<Mail::Salsa>
 
+
 =head1 AUTHOR
 
 Dobrica Pavlinusic, E<lt>dpavlin@rot13.orgE<gt>
 
+
 =head1 COPYRIGHT AND LICENSE
 
 Copyright (C) 2005 by Dobrica Pavlinusic