Skip to content
Extraits de code Groupes Projets
Valider 8ba1bc26 rédigé par Alexandre Morignot's avatar Alexandre Morignot
Parcourir les fichiers

Fixes #19: no more "lc $chan->[0]" and other shit everywhere

parent db08c382
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -15,10 +15,9 @@ our $log; ...@@ -15,10 +15,9 @@ our $log;
sub exec { sub exec {
my ($chan, $msg, $chan_src) = @_; my ($chan, $msg, $chan_src) = @_;
$chan->[0] = lc $chan->[0];
my $query = commands::get::query->new( my $query = commands::get::query->new(
chan => $chan->[0], chan => $chan,
query => ($msg) ? $msg : '' query => ($msg) ? $msg : ''
); );
...@@ -86,8 +85,8 @@ sub exec { ...@@ -86,8 +85,8 @@ sub exec {
my $irc_msg = utils::print::print(\%content_h); my $irc_msg = utils::print::print(\%content_h);
# if in query # if in query
if ($chan->[0] !~ /^#/) { if ($chan !~ /^#/) {
$irc_msg .= ' [' . $chan_src->[0] . ']'; $irc_msg .= ' [' . $chan_src . ']';
} }
else { else {
$irc_msg .= ' [' . $rows . ' résultat'; $irc_msg .= ' [' . $rows . ' résultat';
...@@ -103,7 +102,7 @@ sub exec { ...@@ -103,7 +102,7 @@ sub exec {
VALUES (?,?,?)'); VALUES (?,?,?)');
$log->error("Couldn't prepare querie; aborting") unless (defined $sth); $log->error("Couldn't prepare querie; aborting") unless (defined $sth);
$sth->execute($content->[0], $chan->[0], "PlayBot") $sth->execute($content->[0], $chan, "PlayBot")
or $log->error("Couldn't finish transaction: " . $dbh->errstr); or $log->error("Couldn't finish transaction: " . $dbh->errstr);
$dbh->commit(); $dbh->commit();
......
...@@ -45,17 +45,17 @@ sub exec { ...@@ -45,17 +45,17 @@ sub exec {
my ($kernel, $user, $chan, $msg) = @_; my ($kernel, $user, $chan, $msg) = @_;
my ($nick, $mask) = split(/!/,$user); my ($nick, $mask) = split(/!/,$user);
if ($msg eq '!' and $command{lc $chan->[0]}) { if ($msg eq '!' and $command{$chan}) {
$msg = $command{lc $chan->[0]}; $msg = $command{$chan};
} }
if ($msg =~ /^ *!fav(?: (\S+))? *$/) { if ($msg =~ /^ *!fav(?: (\S+))? *$/) {
my $index = $1; my $index = $1;
try { try {
my $id = utils::id::get($chan->[0], $index); my $id = utils::id::get($chan, $index);
commands::fav::exec($nick, $id) commands::fav::exec($nick, $id)
} catch { } catch {
$irc->yield(privmsg => $chan->[0] => $insultes[rand @insultes]); $irc->yield(privmsg => $chan => $insultes[rand @insultes]);
} }
} }
elsif ($msg =~ /^ *!later(?: (\S+))?(?: in (\d+)(h|m|s)?)? *$/) { elsif ($msg =~ /^ *!later(?: (\S+))?(?: in (\d+)(h|m|s)?)? *$/) {
...@@ -63,10 +63,10 @@ sub exec { ...@@ -63,10 +63,10 @@ sub exec {
my ($time, $unit) = ($2, $3); my ($time, $unit) = ($2, $3);
try { try {
my $id = utils::id::get($chan->[0], $index); my $id = utils::id::get($chan, $index);
commands::later::exec($kernel, $nick, $id, $chan, $time, $unit); commands::later::exec($kernel, $nick, $id, $chan, $time, $unit);
} catch { } catch {
$irc->yield(privmsg => $chan->[0] => $insultes[rand @insultes]); $irc->yield(privmsg => $chan => $insultes[rand @insultes]);
}; };
} }
elsif ($msg =~ /^( *!tag)(?:( +)(-?\d+))?/) { elsif ($msg =~ /^( *!tag)(?:( +)(-?\d+))?/) {
...@@ -82,10 +82,10 @@ sub exec { ...@@ -82,10 +82,10 @@ sub exec {
} }
try { try {
$id = utils::id::get($chan->[0], $index); $id = utils::id::get($chan, $index);
commands::tag::exec($id, $tags); commands::tag::exec($id, $tags);
} catch { } catch {
$irc->yield(privmsg => $chan->[0] => $insultes[rand @insultes]); $irc->yield(privmsg => $chan => $insultes[rand @insultes]);
}; };
} }
elsif ($msg =~ /^( *!get)(?: +.*)?$/) { elsif ($msg =~ /^( *!get)(?: +.*)?$/) {
...@@ -94,7 +94,7 @@ sub exec { ...@@ -94,7 +94,7 @@ sub exec {
my $id = commands::get::exec(@args); my $id = commands::get::exec(@args);
if ($id) { if ($id) {
$lastID->{$chan->[0]} = $id; $lastID->{$chan} = $id;
} }
} }
elsif ($msg =~ /^ *!help/) { elsif ($msg =~ /^ *!help/) {
...@@ -111,13 +111,13 @@ sub exec { ...@@ -111,13 +111,13 @@ sub exec {
$irc->yield(privmsg => $nick => 'Niveau vie privée, potentiellement toute commande (excepté !help) entraine un enregistrement dans la base de données avec au minimum la date et l\'heure et le nick de la personne ayant exécuté la commande.'); $irc->yield(privmsg => $nick => 'Niveau vie privée, potentiellement toute commande (excepté !help) entraine un enregistrement dans la base de données avec au minimum la date et l\'heure et le nick de la personne ayant exécuté la commande.');
} }
elsif ($msg =~/^ *!(fav|lat|tag)/) { elsif ($msg =~/^ *!(fav|lat|tag)/) {
$irc->yield(privmsg => $chan->[0] => $insultes[rand @insultes]); $irc->yield(privmsg => $chan => $insultes[rand @insultes]);
} }
else { else {
return 0; return 0;
} }
$command{lc $chan->[0]} = $msg; $command{$chan} = $msg;
return 1; return 1;
} }
...@@ -125,7 +125,7 @@ sub tag { ...@@ -125,7 +125,7 @@ sub tag {
my ($msg, $chan) = @_; my ($msg, $chan) = @_;
my @tags = ($msg =~ /#([a-zA-Z0-9_-]+)/g); my @tags = ($msg =~ /#([a-zA-Z0-9_-]+)/g);
my $id = utils::id::get($chan->[0]); my $id = utils::id::get($chan);
commands::tag::exec($id, "@tags"); commands::tag::exec($id, "@tags");
} }
......
...@@ -170,10 +170,9 @@ sub on_query ...@@ -170,10 +170,9 @@ sub on_query
my ($kernel, $user, $msg) = @_[KERNEL, ARG0, ARG2]; my ($kernel, $user, $msg) = @_[KERNEL, ARG0, ARG2];
my ($nick) = split (/!/,$user); my ($nick) = split (/!/,$user);
my @fake_chan = ($nick); my $fake_chan = $nick;
my @args = ($kernel, $user, \@fake_chan, $msg); my @args = ($kernel, $user, $fake_chan, $msg);
my $fake_chan = \@fake_chan;
return if (commands::parser::exec(@args)); return if (commands::parser::exec(@args));
if ($msg =~ m/^!/ && $nick eq $admin) { if ($msg =~ m/^!/ && $nick eq $admin) {
...@@ -253,7 +252,7 @@ sub on_invite ...@@ -253,7 +252,7 @@ sub on_invite
sub on_speak sub on_speak
{ {
my ($kernel, $user, $chan, $msg) = @_[KERNEL, ARG0, ARG1, ARG2]; my ($kernel, $user, $chan, $msg) = @_[KERNEL, ARG0, ARG1, ARG2];
my @args = ($kernel, $user, $chan, $msg); my @args = ($kernel, $user, lc $chan->[0], $msg);
my ($nick,$mask) = split(/!/,$user); my ($nick,$mask) = split(/!/,$user);
my %content; my %content;
......
...@@ -7,7 +7,7 @@ sub consume ...@@ -7,7 +7,7 @@ sub consume
{ {
my ($nick, $id, $chan_src) = @_; my ($nick, $id, $chan_src) = @_;
my @args = ([$nick], $id, $chan_src); my @args = ($nick, $id, $chan_src);
commands::get::exec(@args); commands::get::exec(@args);
} }
......
...@@ -99,7 +99,7 @@ sub parse { ...@@ -99,7 +99,7 @@ sub parse {
VALUES (?,?,?)'); VALUES (?,?,?)');
$log->error("Couldn't prepare querie; aborting") unless (defined $sth); $log->error("Couldn't prepare querie; aborting") unless (defined $sth);
$sth->execute($id, $chan->[0], $nick) $sth->execute($id, $chan, $nick)
or $log->error("Couldn't finish transaction: " . $dbh->errstr); or $log->error("Couldn't finish transaction: " . $dbh->errstr);
$dbh->commit; $dbh->commit;
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter