Changeset 7548

Timestamp:

03/06/08 13:49:52 (5 years ago)

Author:

typester

Message:

グループチャットに一応対応

Location:

lang/perl/Skype4IRC/trunk/lib/Skype4IRC

Files:

• IRCD.pm (modified) (3 diffs)
• SkypeBridge.pm (modified) (3 diffs)

lang/perl/Skype4IRC/trunk/lib/Skype4IRC/IRCD.pm

@@ -15 +15 @@
         object_states => [
             $self => {
-                map( { $_ => "poe_$_" } qw/_start _default update_contact privmsg/ ),
+                map( { $_ => "poe_$_" } qw/_start _default update_contact privmsg groupmsg/ ),
             },
-            $self => [qw/ircd_daemon_nick ircd_daemon_privmsg/],
+            $self => [qw/ircd_daemon_nick ircd_daemon_privmsg ircd_daemon_public/],
         ],
     );
@@ -55 +55 @@
 }
 
+sub poe_groupmsg {
+    my ($self, $kernel, $nick, $data) = @_[OBJECT, KERNEL, ARG0, ARG1];
+
+    $self->ircd->_daemon_cmd_join( $self->{nick}, $data->{channel} );
+    for my $member (@{ $data->{members} }) {
+        next if $member eq $self->{nick};
+
+        $kernel->call( update_contact => [[$member, $member]] );
+        $self->ircd->yield( daemon_cmd_join => $member => $data->{channel} );
+    }
+
+    $self->ircd->yield( daemon_cmd_privmsg => $nick => $data->{channel} => $data->{message} );
+}
+
 sub ircd_daemon_privmsg {
     my ($self, $kernel, $who, $target, $what) = @_[OBJECT, KERNEL, ARG0..ARG2];
@@ -60 +74 @@
     my $message = decode('utf-8', $what);
     $kernel->post( skype => send_message => $target => $message );
+}
+
+sub ircd_daemon_public {
+    my ($self, $kernel, $who, $channel, $what) = @_[OBJECT, KERNEL, ARG0..$#_];
+
+    my $message = decode('utf-8', $what);
+    $kernel->post( skype => send_group_message => $channel => $message );
 }
 

lang/perl/Skype4IRC/trunk/lib/Skype4IRC/SkypeBridge.pm

@@ -24 +24 @@
         object_states => [
             $self => {
-                map { $_ => "poe_$_" } qw/_start attach send_message/
+                map { $_ => "poe_$_" } qw/_start attach send_message send_group_message/
             },
         ],
@@ -52 +52 @@
 
     $self->skype->SendMessage($target, encode('cp932', $message));
+}
+
+sub poe_send_group_message {
+    my ($self, $kernel, $channel, $message) = @_[OBJECT, KERNEL, ARG0, ARG1];
+
+    my $target;
+    forEach { $target = $_ if $channel eq $_->Name } $self->skype->Chats;
+    return unless $target;
+
+    $target->SendMessage( encode('cp932', $message) );
 }
 
@@ -90 +100 @@
         warn $message->FromHandle . ' said: ' . $message->Body;
 
-        if ($message->Chat->Type == 0) { # 1:1
+        my $chat_type = $message->Chat->Type;
+        if ($chat_type == 0) { # 1:1
             $kernel->post( ircd => privmsg => $message->FromHandle => decode('cp932', $message->Body) );
         }
-        else {
-            # TODO: group chat
+        elsif ($chat_type == 3) { # group chat
+            my @members;
+            forEach { push @members, $_->Handle } $message->Chat->Members;
+
+            $kernel->post( ircd => groupmsg => $message->FromHandle, {
+                members => \@members,
+                message => decode('cp932', $message->Body),
+                channel => decode('cp932', $message->Chat->Name),
+                topic   => decode('cp932', $message->Chat->Topic || $message->Chat->FriendlyName),
+            } );
         }
     }