From be806806266cffb8c43c0459ee34bdf83868cdf5 Mon Sep 17 00:00:00 2001
From: Pragmatic Software <pragma78@gmail.com>
Date: Mon, 10 Apr 2017 19:16:14 -0700
Subject: [PATCH] Improve twit detection

---
 PBot/Plugins/AntiTwitter.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/PBot/Plugins/AntiTwitter.pm b/PBot/Plugins/AntiTwitter.pm
index b95d148b..410203ab 100644
--- a/PBot/Plugins/AntiTwitter.pm
+++ b/PBot/Plugins/AntiTwitter.pm
@@ -44,13 +44,13 @@ sub on_public {
   $channel = lc $channel;
   return 0 if not $self->{pbot}->{chanops}->can_gain_ops($channel);
 
-  while ($msg =~ m/@([a-z0-9_^{}\-\\\[\]\|]+)/g) {
+  while ($msg =~ m/[＠@]\s*([a-z0-9_^{}\-\\\[\]\|]+)/g) {
     my $n = $1;
     if ($self->{pbot}->{nicklist}->is_present_similar($channel, $n)) {
       $self->{offenses}->{$channel}->{$nick}->{offenses}++;
       $self->{offenses}->{$channel}->{$nick}->{time} = gettimeofday;
       
-      $self->{pbot}->{logger}->log("$nick!$user\@$host is a twit. $self->{offenses}->{$channel}->{$nick}->{offenses} offenses. Msg: $msg\n");
+      $self->{pbot}->{logger}->log("$nick!$user\@$host is a twit. ($self->{offenses}->{$channel}->{$nick}->{offenses} offenses) $channel: $msg\n");
 
       given ($self->{offenses}->{$channel}->{$nick}->{offenses}) {
         when (1) {
@@ -80,7 +80,7 @@ sub adjust_offenses {
 
   foreach my $channel (keys $self->{offenses}) {
     foreach my $nick (keys $self->{offenses}->{$channel}) {
-      if ($now - $self->{offenses}->{$channel}->{$nick}->{time} >= 60 * 60 * 5) {
+      if ($now - $self->{offenses}->{$channel}->{$nick}->{time} >= 60 * 60 * 24 * 7) {
         if (--$self->{offenses}->{$channel}->{$nick}->{offenses} <= 0) {
           delete $self->{offenses}->{$channel}->{$nick};
           delete $self->{offenses}->{$channel} if not keys $self->{offenses}->{$channel};