Minor discord fixes

diff --git a/Bot.pm b/Bot.pm
index 363531217864018f1faf26ab54ec00a37cbeae9d..e20412974d739aed53fcab70262188d564a3bc3f 100644 (file)
--- a/Bot.pm
+++ b/Bot.pm
@@ -255,7 +255,7 @@ sub _build_disp {
                if ($chan =~ /^(.*):(.*)$/){
                        $chan = $1;
                        $self->targets->{$2} = [] unless exists $self->targets->{$2};
                if ($chan =~ /^(.*):(.*)$/){
                        $chan = $1;
                        $self->targets->{$2} = [] unless exists $self->targets->{$2};

-                       push @{$self->targets->{$2}},$chan;
+                       push @{$self->targets->{$2}},lc $chan;

                        say "$2 - @{$self->targets->{$2}}";
                }
                $disp->add_channel($chan,\@types);
                        say "$2 - @{$self->targets->{$2}}";
                }
                $disp->add_channel($chan,\@types);


@@ -449,7 +449,7 @@ sub message {
        my ($self, $msg, @targets) = @_;
 
        for (@targets) {
        my ($self, $msg, @targets) = @_;
 
        for (@targets) {

-               when (/^D-(\d+)$/) {
+               when (/^D-(\d+)$/i) {

                        $self->discordMessage($1, $msg);
                }
                default {
                        $self->discordMessage($1, $msg);
                }
                default {

diff --git a/Delling.pm b/Delling.pm
index ac25d0f400a326f41fd01e3b5328411a10407af6..41d87254ae6ea852db45c148504954f0e36398b2 100644 (file)
--- a/Delling.pm
+++ b/Delling.pm
@@ -103,7 +103,7 @@ WHERE u.hostmask = $1 AND channel = $2 AND flag IN ('o','v');
                $irc->yield(mode => $channel, $mode, @who) if $mode;
        }
 
                $irc->yield(mode => $channel, $mode, @who) if $mode;
        }
 

-       if (lc $channel ~~ lc $self->targets->{members}){
+       if (lc $channel ~~ @{$self->targets->{members}}){

                if (time - $last_announcement < 1){
                        $last_announcement = time;
                        return;
                if (time - $last_announcement < 1){
                        $last_announcement = time;
                        return;


@@ -115,14 +115,14 @@ FROM users u WHERE hostmask = ?
                }, undef, $address);
                if ($user){
                        unless ($user->{password}) {
                }, undef, $address);
                if ($user){
                        unless ($user->{password}) {

-                               $irc->yield(privmsg => $self->targets->{members}, "$nick: Get a new random password with /msg delling !getpass . If you don't know your username, then you can get it with .points");
+                               $irc->yield(privmsg => $channel, "$nick: Get a new random password with /msg delling !getpass . If you don't know your username, then you can get it with .points");

                        }
                        if ($tick > 12 && not defined $user->{pid}){
                        }
                        if ($tick > 12 && not defined $user->{pid}){

-                               $irc->yield(privmsg => $self->targets->{members}, "$nick: go to https://nd.ruin.nu/ and enter your coords.");
+                               $irc->yield(privmsg => $channel, "$nick: go to https://nd.ruin.nu/ and enter your coords.");

                        }
 
                        if (not defined $user->{last_forum_visit}){
                        }
 
                        if (not defined $user->{last_forum_visit}){

-                               $irc->yield(privmsg => $self->targets->{members}, "$nick: Go read the forum! https://nd.ruin.nu/forum");
+                               $irc->yield(privmsg => $channel, "$nick: Go read the forum! https://nd.ruin.nu/forum");

                        }else {
                                my $unread = $dbh->selectrow_hashref(q{SELECT * FROM unread_posts($1)},undef,$user->{uid});
                                if ($unread && $unread->{new}){
                        }else {
                                my $unread = $dbh->selectrow_hashref(q{SELECT * FROM unread_posts($1)},undef,$user->{uid});
                                if ($unread && $unread->{new}){