From f00ee6a37ae537afb8c4b2eb9ea378697e80e043 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Wed, 22 Oct 2014 14:02:23 -0400
Subject: disallow private messages and players playing against themselves

---
 lib/Bot/Zulip/Chess.pm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/Bot/Zulip/Chess.pm b/lib/Bot/Zulip/Chess.pm
index 6180ee9..cc3c66e 100644
--- a/lib/Bot/Zulip/Chess.pm
+++ b/lib/Bot/Zulip/Chess.pm
@@ -92,7 +92,7 @@ sub step ($self) {
     for my $event ($res->{events}->@*) {
         next unless $event->{type} eq 'message';
         my $message = $event->{message};
-        # next if $message->{type} eq 'private';
+        next if $message->{type} eq 'private';
         my $bot_name = $self->bot_name;
         my $content = $message->{content};
         next unless $content =~ s/^\@\*\*$bot_name\*\*//;
@@ -111,14 +111,14 @@ sub step ($self) {
 }
 
 sub handle_move ($self, $player, $move) {
-    if ($self->needs_new_player) {
-        $self->set_new_player($player);
-    }
-
     if (!$self->players_turn($player)) {
         return "It's not your turn!";
     }
     else {
+        if ($self->needs_new_player) {
+            $self->set_new_player($player);
+        }
+
         return try {
             $self->_chessboard->go_move($move);
             my $state = $self->draw_state;
@@ -173,6 +173,9 @@ sub draw_state ($self) {
 sub players_turn ($self, $player) {
     my $method = $self->turn . '_player';
     my $expected_player = $self->$method;
+    return if grep { $_ eq $player } grep { defined } (
+        $self->white_player, $self->black_player
+    );
     return 1 if !defined($expected_player);
     return 1 if $expected_player eq $player;
     return;
-- 
cgit v1.2.3