Mercurial > hg > skillbot-df
changeset 25:1d57373d1c04
Merging in df's branch
| author | Dominic Cleal <dominic@computerkb.co.uk> |
|---|---|
| date | Sat, 06 Dec 2008 22:54:58 +0000 |
| parents | 7bcc70b2121a (current diff) db2e2a751dd6 (diff) |
| children | bb1f7ab990b1 |
| files | skillbot.pl |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Sat Dec 06 22:54:12 2008 +0000 +++ b/.hgignore Sat Dec 06 22:54:58 2008 +0000 @@ -1,3 +1,4 @@ skillbot\.conf skillbot\.friends skillbot\.pid +~$
--- a/skillbot.pl Sat Dec 06 22:54:12 2008 +0000 +++ b/skillbot.pl Sat Dec 06 22:54:58 2008 +0000 @@ -127,7 +127,7 @@ =cut sub init_timers { - # Join channels fort eh first time, ~15 secs after connect + # Join channels for the first time, ~15 secs after connect add_one_shot_timer(15, sub { my ($timer, $self) = @_; join_channels($self); }); # Check we are in the right channels every 10 minutes @@ -296,8 +296,7 @@ { my ($self, $event) = @_; - my $vstring = sprintf("VERSION twitfolk v%s " . - "(\002grifferz\002 is responsible for this atrocity)", $version); + my $vstring = sprintf("VERSION %s", $ircname); $self->ctcp_reply($event->nick, $vstring); } @@ -398,19 +397,19 @@ if (defined $c && $loaded eq 0) { - irc_debug("EVE: Unable to find character %s for ID %lu", + irc_debug("Unable to find character %s for ID %lu", $c, $uid); next; } $frienduids{$uid} = $loaded; - irc_debug("EVE: Adding new friend %s (%lu), %lu characters", + irc_debug("Adding new friend %s (%lu), %lu characters", $nick, $uid, $loaded); } } } - close(FF) or warn "Something weird when closing friends_file: $!"; + close(FF) or warn "Something weird occured when closing friends_file: $!"; } =pod