Skip to content

Commit fc259fd

Browse files
committed
ignore requests when buffPlease config option is disabled, clearer errors
1 parent 5172413 commit fc259fd

1 file changed

Lines changed: 16 additions & 4 deletions

File tree

plugins/buffplease.pl

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ package OpenKore::Plugins::BuffPlease;
126126
]
127127
);
128128

129+
Misc::configModify( buffPlease => 0 ) if !exists $config{buffPlease};
130+
129131
sub unload {
130132
Plugins::delHooks( $hooks );
131133
Commands::unregister( $cmds );
@@ -179,28 +181,36 @@ sub list {
179181
}
180182

181183
sub validate {
184+
my @errors;
185+
186+
if ( !$config{buffPlease} ) {
187+
push @errors, "[buffplease] Not enabled. To enable: conf buffPlease 1\n";
188+
}
182189

183190
# Validate aliases values. Do the regular expressions compile?
184191
foreach ( sort keys %{ $buff->{aliases} } ) {
185192
next if eval {qr{$buff->{aliases}->{$_}}};
186-
error "[buffplease] Alias key [$_] has an invalid regular expression.\n";
193+
push @errors, "[buffplease] Alias key [$_] has an invalid regular expression.\n";
187194
}
188195

189196
# Validate aliases and ignore keys. Do the skills actually exist?
190197
foreach ( sort keys %{ $buff->{aliases} } ) {
191198
next if Skill::lookupIDNByName( $_ );
192-
error "[buffplease] Alias key [$_] is not a valid skill name!\n";
199+
push @errors, "[buffplease] Alias key [$_] is not a valid skill name!\n";
193200
}
194201
foreach ( sort keys %{ $buff->{ignore} } ) {
195202
next if Skill::lookupIDNByName( $_ );
196-
error "[buffplease] Ignore key [$_] is not a valid skill name!\n";
203+
push @errors, "[buffplease] Ignore key [$_] is not a valid skill name!\n";
197204
}
198205

199206
# Validate permission. Valid values are "all" and "guild".
200207
my $valid_permissions = [qw( all guild )];
201208
if ( !in_array( $valid_permissions, $buff->{permission} ) ) {
202-
error "[buffplease] Permission [$buff->{permission}] is invalid. Valid permissions are: @$valid_permissions\n";
209+
push @errors, "[buffplease] Permission [$buff->{permission}] is invalid. Valid permissions are: @$valid_permissions\n";
203210
}
211+
212+
error join '', @errors if @errors;
213+
message "[buffplease] Validation complete. Found " . @errors . " errors.\n";
204214
}
205215

206216
sub in_array {
@@ -351,6 +361,8 @@ sub parseStatus {
351361
sub parseChat {
352362
my ( $hook, $args ) = @_;
353363

364+
return if !$config{buffPlease};
365+
354366
my $msg = $hook eq 'packet_selfChat' ? $args->{msg} : $args->{Msg};
355367
my $user = $hook eq 'packet_selfChat' ? $args->{user} : $args->{MsgUser};
356368

0 commit comments

Comments
 (0)