Users: id command can now search by wildcarded hostmasks

lib/PBot/Core/Commands/Users.pm

@@ -383,6 +383,36 @@ sub cmd_id {
         $hostmask = $self->{pbot}->{messagehistory}->{database}->find_message_account_by_id($target);
         return "I don't know anybody with id $target." if not $hostmask;
         $message_account = $target;
+    } elsif ($target =~ m/[!@]/) {
+        my @accounts = $self->{pbot}->{messagehistory}->{database}->find_message_accounts_by_mask($target, 20);
+
+        my %seen;
+        @accounts = grep !$seen{$_}++, @accounts;
+
+        if (not @accounts) {
+            return "I don't know anybody matching hostmask $target.";
+        } elsif (@accounts > 1) {
+            # found more than one account, list them
+            my %users;
+
+            foreach my $account (@accounts) {
+                next if exists $users{$account};
+                my $hostmask = $self->{pbot}->{messagehistory}->{database}->find_most_recent_hostmask($account);
+                $users{$account} = $hostmask;
+            }
+
+            my @hostmasks;
+
+            foreach my $id (keys %users) {
+                push @hostmasks, "$users{$id} ($id)";
+            }
+
+            return "Found multiple accounts: " . (join ', ', sort @hostmasks);
+        } else {
+            # found just one account, we'll use it
+            $message_account = $accounts[0];
+            $hostmask = $self->{pbot}->{messagehistory}->{database}->find_most_recent_hostmask($accounts[0]);
+        }
     } else {
         ($message_account, $hostmask) = $self->{pbot}->{messagehistory}->{database}->find_message_account_by_nick($target);
         return "I don't know anybody named $target." if not $message_account;

lib/PBot/Core/MessageHistory/Storage/SQLite.pm

@@ -378,17 +378,20 @@ sub find_message_accounts_by_nickserv {
 }
 
 sub find_message_accounts_by_mask {
-    my ($self, $mask) = @_;
+    my ($self, $mask, $limit) = @_;
+
+    $limit //= 100;
 
     my $qmask = quotemeta $mask;
     $qmask =~ s/_/\\_/g;
+    $qmask =~ s/\\\./_/g;
     $qmask =~ s/\\\*/%/g;
     $qmask =~ s/\\\?/_/g;
     $qmask =~ s/\\\$.*$//;
 
     my $accounts = eval {
-        my $sth = $self->{dbh}->prepare('SELECT id FROM Hostmasks WHERE hostmask LIKE ? ESCAPE "\"');
-        $sth->execute($qmask);
+        my $sth = $self->{dbh}->prepare('SELECT id FROM Hostmasks WHERE hostmask LIKE ? ESCAPE "\" LIMIT ?');
+        $sth->execute($qmask, $limit);
         return $sth->fetchall_arrayref();
     };
     $self->{pbot}->{logger}->log($@) if $@;

lib/PBot/VERSION.pm

@@ -25,8 +25,8 @@ use PBot::Imports;
 # These are set by the /misc/update_version script
 use constant {
     BUILD_NAME     => "PBot",
-    BUILD_REVISION => 4388,
-    BUILD_DATE     => "2021-09-12",
+    BUILD_REVISION => 4389,
+    BUILD_DATE     => "2021-09-14",
 };
 
 sub initialize {}