Changeset 9a023d0 for perl/modules

Timestamp:

Feb 6, 2010, 6:11:26 PM (15 years ago)

Author:

Geoffrey Thomas <geofft@mit.edu>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

3f18ad5

Parents:

c3a47c9

git-author:

Joshua Oreman <oremanj@mit.edu> (02/06/10 18:11:26)

git-committer:

Geoffrey Thomas <geofft@mit.edu> (02/06/10 18:11:26)

Message:

Send multiple PRIVMSGs for IRC messages entered as multiple paragraphs

It is occasionally useful to be able to send multiple lines of IRC text
at once, and I've grown used to barnowl's excellent support for
composing long messages. As a compromise between allowing multiline IRC
messages and not causing autowrap to send them inadvertently, send one
IRC-level message (PRIVMSG or CTCP ACTION) for each
two-newlines-separated paragraph in the user input to :irc-msg.

Reviewed-by: Geoffrey Thomas <geofft@mit.edu>

File:

• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (1 diff)

perl/modules/IRC/lib/BarnOwl/Module/IRC.pm

@@ -453 +453 @@
     my $conn = shift;
     my $to = shift;
-    my $body = shift;
-    # Strip whitespace. In the future -- send one message/line?
-    $body =~ tr/\n\r/  /;
-    if ($body =~ /^\/me (.*)/) {
-        $conn->conn->me($to, Encode::encode('utf-8', $1));
-        $body = '* '.$conn->nick.' '.$1;
-    } else {
-        $conn->conn->privmsg($to, Encode::encode('utf-8', $body));
-    }
-    my $msg = BarnOwl::Message->new(
-        type        => 'IRC',
-        direction   => is_private($to) ? 'out' : 'in',
-        server      => $conn->server,
-        network     => $conn->alias,
-        recipient   => $to,
-        body        => $body,
-        sender      => $conn->nick,
-        is_private($to) ?
-          (isprivate  => 'true') : (channel => $to),
-        replycmd    => BarnOwl::quote('irc-msg',  '-a', $conn->alias, $to),
-        replysendercmd => BarnOwl::quote('irc-msg', '-a', $conn->alias, $to),
-       );
-    BarnOwl::queue_message($msg);
+    my $fullbody = shift;
+    my @msgs;
+    # Require the user to send in paragraphs (double-newline between) to
+    # actually send multiple PRIVMSGs, in order to play nice with autofill.
+    $fullbody =~ s/\r//g;
+    @msgs = split "\n\n", $fullbody;
+    map { tr/\n/ / } @msgs;
+    for my $body (@msgs) {
+        if ($body =~ /^\/me (.*)/) {
+            $conn->conn->me($to, Encode::encode('utf-8', $1));
+            $body = '* '.$conn->nick.' '.$1;
+        } else {
+            $conn->conn->privmsg($to, Encode::encode('utf-8', $body));
+        }
+        my $msg = BarnOwl::Message->new(
+            type        => 'IRC',
+            direction   => is_private($to) ? 'out' : 'in',
+            server      => $conn->server,
+            network     => $conn->alias,
+            recipient   => $to,
+            body        => $body,
+            sender      => $conn->nick,
+            is_private($to) ?
+              (isprivate  => 'true') : (channel => $to),
+            replycmd    => BarnOwl::quote('irc-msg',  '-a', $conn->alias, $to),
+            replysendercmd => BarnOwl::quote('irc-msg', '-a', $conn->alias, $to),
+        );
+        BarnOwl::queue_message($msg);
+    }
     return;
 }