From ce857ad5f744f74b15ca36264609282c5642778e Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Wed, 5 Aug 2015 10:39:02 +0400
Subject: Fix various things

* Fix a typo
* Adjust the ;restrict regex to allow using event IDs for restrictions
* Add a falsematch command to make DLange shut up
* Don't allow nohush commands be used by those with nocommands restriction
* Stop making ASM -i
---
 config-default/commands.xml | 9 +++++++--
 modules/command.pl          | 2 +-
 modules/event.pl            | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/config-default/commands.xml b/config-default/commands.xml
index 6066104..5674fac 100644
--- a/config-default/commands.xml
+++ b/config-default/commands.xml
@@ -356,7 +356,7 @@
     delete($::users->{person}->{$nick});
     ASM::XML->writeUsers();
     $conn->privmsg($event->replyto, "Removed $nick from authorized users." .
-      "MAKE SURE YOU PROVIDED a nickserv account to this command, rather than the nick the accountholder");
+      " MAKE SURE YOU PROVIDED a nickserv account to this command, rather than the nick the accountholder");
   ]]>
   </command>
   <command cmd="^;target (\S+) (\S+) ?(\S*)$" flag="a">
@@ -522,7 +522,7 @@
     $conn->privmsg($event->replyto, 'config files were re-read');
   ]]>
   </command>
-  <command cmd="^;restrict (nick|account|host) (\S+) (\+|-)([a-z]+)$" flag="a">
+  <command cmd="^;restrict (nick|account|host) (\S+) (\+|-)([a-z0-9_-]+)$" flag="a">
   <![CDATA[
     my ($type, $who, $mode, $restriction) = ($1, lc $2, $3, $4);
     if ($mode eq '-') {
@@ -691,4 +691,9 @@
     }
   ]]>
   </command>
+  <command cmd="^;falsematch\b" flag="s">
+  <![CDATA[
+    $conn->privmsg($event->replyto, 'To whitelist false matches for the impersonation check, have someone with the a flag run ";restrict nick LegitimateNickGoesHere +nonickbl_impersonate". Contact ilbelkyr if this issue reoccurs.');
+  ]]>
+  </command>
 </commands>
diff --git a/modules/command.pl b/modules/command.pl
index dd270ea..aa79f4d 100644
--- a/modules/command.pl
+++ b/modules/command.pl
@@ -45,7 +45,7 @@ sub command
     if ($cmd=~/$command->{cmd}/) {
       ASM::Util->dprint("$event->{from} told me: $cmd", "commander");
       if (!ASM::Util->notRestricted($nick, "nocommands")) {
-        $fail = 1 unless (defined($command->{nohush}) && ($command->{nohush} eq "nohush"));
+        $fail = 1;
       }
       if ($fail == 1) {
         $conn->privmsg($nick, "You don't have permission to use that command, or you're not signed into nickserv.");
diff --git a/modules/event.pl b/modules/event.pl
index b2490b0..873fb89 100644
--- a/modules/event.pl
+++ b/modules/event.pl
@@ -227,7 +227,7 @@ sub on_account
 
 sub on_connect {
   my ($conn, $event) = @_; # need to check for no services
-  $conn->sl("MODE $event->{args}->[0] +Q-i");
+  $conn->sl("MODE $event->{args}->[0] +Q");
   if (lc $event->{args}->[0] ne lc $::settings->{nick}) {
     ASM::Util->dprint('Attempting to regain my main nick', 'startup');
     $conn->privmsg( 'NickServ@services.', "regain $::settings->{nick} $::settings->{pass}" );
-- 
cgit v1.2.3