GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-23 11:12:42 +01:00
Code Issues Projects Releases Wiki Activity

Factoids: add more pastebin URLs for factadd -url; update help URL to point at TOC

Browse Source
This commit is contained in:
Pragmatic Software 2022-12-25 18:17:14 -08:00
parent 77a24faf02
commit 38d9c86984
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/PBot/Core/Commands/Factoids.pm
View File

@ -689,6 +689,14 @@ sub cmd_add_regex {
return "/say $keyword added."; return "/say $keyword added.";
} }
# FIXME: use registry array instead
my @valid_pastesites = (
'https?://sprunge.us',
'https?://ix.io',
'https?://dpaste.com',
'https?://0x0.st',
);
sub cmd_factadd { sub cmd_factadd {
my ($self, $context) = @_; my ($self, $context) = @_;
@ -728,8 +736,8 @@ sub cmd_factadd {
my ($url) = $self->{pbot}->{interpreter}->split_args(\@arglist, 1); my ($url) = $self->{pbot}->{interpreter}->split_args(\@arglist, 1);
# FIXME: move this to registry # FIXME: move this to registry
if ($url !~ m/^https?:\/\/(?:sprunge.us|ix.io)\/\w+$/) { if (not grep { $url =~ m/^$_/i } @valid_pastesites) {
return "Invalid URL: acceptable URLs are: http://sprunge.us, http://ix.io"; return "Invalid URL: acceptable URLs are: " . join(', ', sort @valid_pastesites);
} }
# create a UserAgent # create a UserAgent
@ -1314,7 +1322,9 @@ sub cmd_factchange {
if (defined $url) { if (defined $url) {
# FIXME: move this to registry # FIXME: move this to registry
if ($url !~ m/^https?:\/\/(?:sprunge.us|ix.io)\/\w+$/) { return "Invalid URL: acceptable URLs are: http://sprunge.us, http://ix.io"; } if (not grep { $url =~ m/^$_/i } @valid_pastesites) {
return "Invalid URL: acceptable URLs are: " . join(', ', sort @valid_pastesites);
}
my $ua = LWP::UserAgent->new(timeout => 10); my $ua = LWP::UserAgent->new(timeout => 10);
my $response = $ua->get($url); my $response = $ua->get($url);