take a few more things literally

[infobot.git] / src / Modules / pager.pl

diff --git a/src/Modules/pager.pl b/src/Modules/pager.pl
index 56bc49554adbf0381b2a09a1b81e9978093bfcae..c0e32854fdb1a7dd699cdb54f1d88b5ea7744471 100644 (file)
--- a/src/Modules/pager.pl
+++ b/src/Modules/pager.pl
@@ -1,6 +1,16 @@
 # Pager
 #
-# modified from pager.pm in flooterbuck
+# modified from pager.pm in flooterbuck changes are:
+#
+# Copyright (c) 2004 Tim Riker <Tim@Rikers.org>
+#
+# This package is free software;  you can redistribute it and/or
+# modify it under the terms of the license found in the file
+# named LICENSE that should have accompanied this file.
+#
+# THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
 package pager;
 use strict;
@@ -17,10 +27,14 @@ BEGIN {
 sub pager::page {
        my ($message) = @_;
        my ($retval);
+
+       # TODO only allow registered users?
+
        if ($no_page) {
-               &main::status("page module requires Mail::Mailer.");
+               &::status('page module requires Mail::Mailer.');
                return 'page module not active';
        }
+
        unless ($message =~ /^(\S+)\s+(.*)$/) {
                return undef;
        }
@@ -29,37 +43,43 @@ sub pager::page {
        my $to = $1;
        my $msg = $2;
 
-       my $tofactoid = &::getFactoid("${to}'s pager");
+       # allow optional trailing : ie: page foo[:] hello
+       $to =~ s/:$//;
+
+       my $tofactoid = &::getFactoid(lc "${to}'s pager");
        if ($tofactoid =~ /(\S+@\S+)/) {
                my $toaddr = $1;
                $toaddr =~ s/^mailto://;
+               # TODO require sender-locked factoid?
 
-               my $fromfactoid = &::getFactoid("${from}'s pager");
+               my $fromfactoid = &::getFactoid(lc "${from}'s pager");
 
                my $fromaddr;
                if ($fromfactoid =~ /(\S+@\S+)/) {
                        $fromaddr = $1;
                        $fromaddr =~ s/^mailto://;
                } else {
+                       # TODO require sender to have valid self-locked pager factoid?
                        $fromaddr = 'infobot@example.com';
                }
 
                my $channel = $::chan || 'infobot';
+               # TODO disallow use from private message? $chan='_default'
 
-               &main::status("pager: from $from <$fromaddr>, to $to <$toaddr>, msg \"$msg\"");
+               &::status("pager: from $from <$fromaddr>, to $to <$toaddr>, msg \"$msg\"");
                my %headers = (
                        To => "$to <$toaddr>",
                        From => "$from <$fromaddr>",
                        Subject => "Message from $channel!",
-                       'X-Mailer' => "blootbot",
+                       'X-Mailer' => 'blootbot',
                );
 
-               #my $logmsg;
-               #for (keys %headers) {
-               #       $logmsg .= "$_: $headers{$_}\n";
-               #}
-               #$logmsg .= "\n$msg\n";
-               #&main::status("pager:\n$logmsg");
+#              my $logmsg;
+#              for (keys %headers) {
+#                      $logmsg .= "$_: $headers{$_}\n";
+#              }
+#              $logmsg .= "\n$msg\n";
+#              &::status("pager:\n$logmsg");
 
                my $failed;
                my $mailer = new Mail::Mailer 'sendmail';
@@ -70,7 +90,7 @@ sub pager::page {
                if ($failed) {
                        $retval='Sorry, an error occurred while sending mail.';
                } else {
-                       $retval="$from: I sent mail to $toaddr.";
+                       $retval="$from: I sent mail to $toaddr from $fromaddr.";
                }
        } else {
                $retval="Sorry, I don't know ${to}'s email address.";
@@ -78,5 +98,5 @@ sub pager::page {
        &::performStrictReply($retval);
 }
 
-"pager";
+'pager';
 # vim: ts=2 sw=2