diff options
| author |  Janik Kleinhoff <ilbelkyr@shalture.org> | 2016-10-29 00:19:48 +0000 |
|---|---|---|
| committer | Janik Kleinhoff <ilbelkyr@shalture.org> | 2016-10-29 00:19:48 +0000 |
| commit | ef2cd8fdb38de61963c76398e1be457d59afdbc1 (patch) | |
| tree | 3f355b4f31294235fe2d1b78ac942636430f3aa0 | |
| parent | 3dda2775b73b29ca72f3996eb5788124950f9e70 (diff) | |
| download | antispammeta-ef2cd8fdb38de61963c76398e1be457d59afdbc1.tar.bz2 antispammeta-ef2cd8fdb38de61963c76398e1be457d59afdbc1.tar.xz antispammeta-ef2cd8fdb38de61963c76398e1be457d59afdbc1.tar.zst | |
fix !ops with new DB interface
| -rw-r--r-- | lib/ASM/Commander.pm | 2 | ||||
| -rw-r--r-- | lib/ASM/Log.pm | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/ASM/Commander.pm b/lib/ASM/Commander.pm index 39a566f..edad532 100644 --- a/lib/ASM/Commander.pm +++ b/lib/ASM/Commander.pm @@ -969,7 +969,7 @@ sub cmd_ops { $ops_ignored{$tgt} = 1; $conn->schedule(45, sub { delete $ops_ignored{$tgt} }); } - my $uuid = $::log->incident($tgt, "$tgt: $event->{nick} requested op attention\n"); + my $uuid = $::log->incident($tgt, $event->{nick}, undef, undef, undef, 'opalert'); $txtz = $txtz . ' ' . ASM::Shortener->shorturl($::settings->{web}->{detectdir} . $uuid . '.txt'); my @tgts = ASM::Util->getAlert($tgt, 'opalert', 'msgs'); ASM::Util->sendLongMsg($conn, \@tgts, $txtz); diff --git a/lib/ASM/Log.pm b/lib/ASM/Log.pm index e9a6d6f..319ea40 100644 --- a/lib/ASM/Log.pm +++ b/lib/ASM/Log.pm @@ -144,7 +144,15 @@ sub incident $chan = lc $chan; my $uuid = $self->{UUID}->create_str(); - my $header = "$chan: $risk risk: $nick - $reason\n"; + my $is_opalert = ($risk eq 'opalert'); + + my $header; + if ($is_opalert) { + $header = "$chan: $nick requested op attention\n"; + } + else { + $header = "$chan: $risk risk: $nick - $reason\n"; + } open(FH, '>', $self->{CONFIG}->{detectdir} . $uuid . '.txt'); print FH $header; @@ -154,6 +162,8 @@ sub incident print FH "\n\n"; close(FH); + return if $is_opalert; + $gecos //= "NOT_DEFINED"; $::db->resultset('Alertlog')->create({ |