plugin API update, add $request param to message_replace_imprementation()

method (ticket: #17752)

diff --git a/ChangeLog b/ChangeLog
index 8d9c2c8..a933598 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
        * lib/templates/ipod-sjis/all.html: automaticaly focus to
          message input form when new messages button clicked.
+       * lib/plugins/*: plugin API update, add $request parameter
+         to message_replace_imprementation() method (ticket: #17752)
 
 2009-07-04  ISHIKAWA Mutsumi <ishikawa@hanzubon.jp>
 

diff --git a/lib/plugins/00all b/lib/plugins/00all
index e9357c9..f22eae8 100644 (file)
--- a/lib/plugins/00all
+++ b/lib/plugins/00all
@@ -1,7 +1,7 @@
 # -*- mode: perl; coding: utf-8 -*-
 # keitairc/lib/plugins/00all
 # チャネルの全メッセージ閲覧
-# $Id: 00all,v 1.16 2009-01-04 13:17:58 nyan_ Exp $
+# $Id: 00all,v 1.17 2009-07-12 02:54:22 ishikawa Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/00all,v $
 
 # The line number (1 incremented) and filename below must be
@@ -38,7 +38,7 @@ $plugin = {
                                        $p->{nick} = $::ib->simple_escape(@{$np}[$lp]);
                                        my $message = $::ib->colorize($::ib->simple_escape(@{$mp}[$lp])) || '';
                                        for my $name ($::pl->list_replace_plugins()){
-                                               last if $message =~ s/$::pl->{plugins}->{$name}->{message_replace_regexp}/$::pl->{plugins}->{$name}->{message_replace_imprementation}($session_id, $1, $2, $3, $4, $5, $6, $7, $8, $9)/eg;
+                                               last if $message =~ s/$::pl->{plugins}->{$name}->{message_replace_regexp}/$::pl->{plugins}->{$name}->{message_replace_imprementation}($request, $session_id, $1, $2, $3, $4, $5, $6, $7, $8, $9)/eg;
                                        }
                                        $message =~ s/\s+$//;
                                        $message =~ s/\s+/ /g;

diff --git a/lib/plugins/00recent b/lib/plugins/00recent
index d2f208f..0c2d2a1 100644 (file)
--- a/lib/plugins/00recent
+++ b/lib/plugins/00recent
@@ -1,7 +1,7 @@
 # -*- mode: perl; coding: utf-8 -*-
 # keitairc/lib/plugins/00recent
 # 未読発言一覧
-# $Id: 00recent,v 1.13 2009-01-04 13:17:58 nyan_ Exp $
+# $Id: 00recent,v 1.14 2009-07-12 02:54:22 ishikawa Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/00recent,v $
 
 # The line number (1 incremented) and filename below must be
@@ -42,7 +42,7 @@ $plugin = {
                                                $pp->{nick} = $::ib->simple_escape(@{$np}[$lp]);
                                                my $message = $::ib->colorize($::ib->simple_escape(@{$mp}[$lp])) || '';
                                                for my $name ($::pl->list_replace_plugins()){
-                                                       last if $message =~ s/$::pl->{plugins}->{$name}->{message_replace_regexp}/$::pl->{plugins}->{$name}->{message_replace_imprementation}($session_id, $1, $2, $3, $4, $5, $6, $7, $8, $9)/eg;
+                                                       last if $message =~ s/$::pl->{plugins}->{$name}->{message_replace_regexp}/$::pl->{plugins}->{$name}->{message_replace_imprementation}($request, $session_id, $1, $2, $3, $4, $5, $6, $7, $8, $9)/eg;
                                                }
                                                $message =~ s/\s+$//;
                                                $message =~ s/\s+/ /g;

diff --git a/lib/plugins/00unread b/lib/plugins/00unread
index 98f628e..f6f6b6f 100644 (file)
--- a/lib/plugins/00unread
+++ b/lib/plugins/00unread
@@ -1,7 +1,7 @@
 # -*- mode: perl; coding: utf-8 -*-
 # keitairc/lib/plugins/00unread
 # チャネルの未読メッセージ閲覧
-# $Id: 00unread,v 1.15 2009-01-04 13:49:15 nyan_ Exp $
+# $Id: 00unread,v 1.16 2009-07-12 02:54:22 ishikawa Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/00unread,v $
 
 # The line number (1 incremented) and filename below must be
@@ -39,7 +39,7 @@ $plugin = {
                                        $p->{nick} = $::ib->simple_escape(@{$np}[$lp]);
                                        my $message = $::ib->colorize($::ib->simple_escape(@{$mp}[$lp])) || '';
                                        for my $name ($::pl->list_replace_plugins()){
-                                               last if $message =~ s/$::pl->{plugins}->{$name}->{message_replace_regexp}/$::pl->{plugins}->{$name}->{message_replace_imprementation}($session_id, $1, $2, $3, $4, $5, $6, $7, $8, $9)/eg;
+                                               last if $message =~ s/$::pl->{plugins}->{$name}->{message_replace_regexp}/$::pl->{plugins}->{$name}->{message_replace_imprementation}($request, $session_id, $1, $2, $3, $4, $5, $6, $7, $8, $9)/eg;
                                        }
                                        $message =~ s/\s+$//;
                                        $message =~ s/\s+/ /g;

diff --git a/lib/plugins/10url b/lib/plugins/10url
index 023c7a2..17eb6a7 100644 (file)
--- a/lib/plugins/10url
+++ b/lib/plugins/10url
@@ -1,7 +1,7 @@
 # -*- mode: perl; coding: utf-8 -*-
 # keitairc/lib/plugins/10url
 # URL処理
-# $Id: 10url,v 1.10 2008-12-31 13:59:52 morimoto Exp $
+# $Id: 10url,v 1.11 2009-07-12 02:54:22 ishikawa Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/10url,v $
 
 # The line number (1 incremented) and filename below must be
@@ -13,7 +13,7 @@ $plugin = {
 
        message_replace_regexp => '\b(https?://[/!-;=-\177]+|www\.[/!-\177]+)',
        message_replace_imprementation => sub {
-               my ($session_id, $param) = @_;
+               my ($request, $session_id, $param) = @_;
                if($param =~ m/^http/){
                        return sprintf('<a target="_self" class="inline" href="%s%s/url/%s">%s</a>',
                                       $::cf->web_root(),

diff --git a/lib/plugins/20mail b/lib/plugins/20mail
index 61f4ad9..ff41893 100644 (file)
--- a/lib/plugins/20mail
+++ b/lib/plugins/20mail
@@ -1,7 +1,7 @@
 # -*- mode: perl; coding: utf-8 -*-
 # keitairc/lib/plugins/20mail
 # メールアドレス
-# $Id: 20mail,v 1.7 2008-12-31 13:59:52 morimoto Exp $
+# $Id: 20mail,v 1.8 2009-07-12 02:54:22 ishikawa Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/20mail,v $
 
 # The line number (1 incremented) and filename below must be
@@ -13,7 +13,7 @@ $plugin = {
 
        message_replace_regexp => '\b(\w[\w.+=-]*\@[\w.-]+[\w]\.[\w]{2,4})\b',
        message_replace_imprementation => sub {
-               my ($session_id, $param) = @_;
+               my ($request, $session_id, $param) = @_;
                sprintf('<a target="_self" class="inline" href="%s%s/mail/%s">%s</a>',
                        $::cf->web_root(), $session_id, $param, $param);
        },

diff --git a/lib/plugins/20phone b/lib/plugins/20phone
index 4eecad1..5545d1e 100644 (file)
--- a/lib/plugins/20phone
+++ b/lib/plugins/20phone
@@ -1,7 +1,7 @@
 # -*- mode: perl; coding: utf-8 -*-
 # keitairc/lib/plugins/20phone
 # 電話番号
-# $Id: 20phone,v 1.8 2008-12-31 13:59:52 morimoto Exp $
+# $Id: 20phone,v 1.9 2009-07-12 02:54:22 ishikawa Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/20phone,v $
 
 # The line number (1 incremented) and filename below must be
@@ -13,7 +13,7 @@ $plugin = {
 
        message_replace_regexp => '\b(0\d{1,3})([-(]?)(\d{2,4})([-)]?)(\d{4})\b',
        message_replace_imprementation => sub {
-               my ($session_id, $p1, $p2, $p3, $p4, $p5) = @_;
+               my ($request, $session_id, $p1, $p2, $p3, $p4, $p5) = @_;
                sprintf('<a target="_self" class="inline" href="%s%s/phone/%s%s%s">%s%s%s%s%s</a>',
                        $::cf->web_root(),
                        $session_id,

diff --git a/lib/plugins/32address b/lib/plugins/32address
index e23fa60..4c61547 100644 (file)
--- a/lib/plugins/32address
+++ b/lib/plugins/32address
@@ -3,7 +3,7 @@
 # based on 'Add link to google maps japan on address-like texts'
 # by twk, from http://nonn-et-twk.net/twk/node/51
 # 
-# $Id: 32address,v 1.7 2008-12-31 13:59:52 morimoto Exp $
+# $Id: 32address,v 1.8 2009-07-12 02:54:22 ishikawa Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/32address,v $
 
 # The line number (1 incremented) and filename below must be
@@ -43,7 +43,7 @@ $plugin = {
        message_replace_regexp => '(' . $re->{general} . ')',
 
        message_replace_imprementation => sub {
-               my ($session_id, $src) = @_;
+               my ($request, $session_id, $src) = @_;
                my $s = $src;
                $s =~ s/.*($re->{general}).*/$1/;
                # remove building names since google maps rarely recognize them

diff --git a/lib/plugins/33distinct b/lib/plugins/33distinct
index 6a19829..aa72bca 100644 (file)
--- a/lib/plugins/33distinct
+++ b/lib/plugins/33distinct
@@ -3,7 +3,7 @@
 # based on 'Add link to google maps japan on address-like texts'
 # by twk, from http://nonn-et-twk.net/twk/node/51
 # 
-# $Id: 33distinct,v 1.3 2008-12-31 13:59:52 morimoto Exp $
+# $Id: 33distinct,v 1.4 2009-07-12 02:54:22 ishikawa Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/33distinct,v $
 
 # The line number (1 incremented) and filename below must be
@@ -38,7 +38,7 @@ $plugin = {
        message_replace_regexp => '(' . $re->{general} . ')',
 
        message_replace_imprementation => sub {
-               my ($session_id, $src) = @_;
+               my ($request, $session_id, $src) = @_;
                my $s = $src;
                $s =~ s/.*($re->{general}).*/$1/;
                # remove building names since google maps rarely recognize them

diff --git a/lib/plugins/99keyword b/lib/plugins/99keyword
index 3630b6a..66c3d6b 100644 (file)
--- a/lib/plugins/99keyword
+++ b/lib/plugins/99keyword
@@ -1,7 +1,7 @@
 # -*- mode: perl; coding: utf-8 -*-
 # keitairc/lib/plugins/12keyword
 # Keyword処理
-# $Id: 99keyword,v 1.2 2008-12-29 11:20:42 morimoto Exp $
+# $Id: 99keyword,v 1.3 2009-07-12 02:54:22 ishikawa Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/99keyword,v $
 
 # The line number (1 incremented) and filename below must be
@@ -15,7 +15,7 @@ $plugin = {
 
        message_replace_regexp => '(.*)',
        message_replace_imprementation => sub {
-               my ($session_id, $message) = @_;
+               my ($request, $session_id, $message) = @_;
                if(defined $::cf->irc_keyword()){
                        my $keywords = $::cf->irc_keyword();
                        Encode::_utf8_on($keywords);