Changeset 33535

Timestamp:

05/24/09 02:28:58 (4 years ago)

Author:

topia

Message:

Support rejoin with a channel can't get +b/+e/+I list without operator
privilege, but requires r33534's change.

Files:

• lang/perl/tiarra/trunk/module/Channel/Rejoin.pm (modified) (5 diffs)

lang/perl/tiarra/trunk/module/Channel/Rejoin.pm

@@ -28 +28 @@
     # got_oper => 既にPART->JOINしているかどうか。
     # cmd_buf => ARRAY<Tiarra::IRC::Message>
+    # num_got_errors => このチャンネルのエラーをみた回数
     $this;
 }
@@ -134 +135 @@
         server => $server,
         cmd_buf => [],
+        num_got_errors => 0,
     };
     
@@ -174 +176 @@
                     Params => [$ch_name,$_]));
         }
+        $session->{got_elist} =
+            $session->{got_blist} =
+            $session->{got_Ilist} = 0;
     }
     else {
@@ -249 +254 @@
         }
     };
-    
+
     if ($msg->command eq RPL_CHANNELMODEIS) {
         # MODEリプライ
@@ -289 +294 @@
         }
     }
+    elsif ($msg->command eq ERR_CHANOPRIVSNEEDED) {
+        $session = $this->{sessions}->{$msg->param(1)};
+        if (defined $session) {
+            $session->{num_got_errors}++;
+        }
+    }
 
     # $sessionが空でなければ、必要な情報が全て揃った可能性がある。
     if (defined $session && !$session->{got_oper} &&
-        $session->{got_mode} && $session->{got_blist} &&
-        $session->{got_elist} && $session->{got_Ilist}) {
+        $session->{got_mode} && ($session->{got_blist} +
+        $session->{got_elist} + $session->{got_Ilist} +
+        $session->{num_got_errors}) >= 3) {
         $this->part_and_join($session);
     }