diff options
author | Tom Feist <shabble@metavore.org> | 2012-02-03 00:39:59 +0000 |
---|---|---|
committer | Tom Feist <shabble@metavore.org> | 2012-02-03 00:39:59 +0000 |
commit | 5431a68eebeabf20730eeef6d9f3e12b37c60611 (patch) | |
tree | 01c1ffc2b91388a0ca9ba7e51690da5542568403 /auto-server/auto_server.pl | |
parent | fixerying grep, trying ot introduce colouring of matches. Some initial work o... (diff) | |
parent | Merge branch 'master' into richoH-dev (diff) | |
download | irssi-scripts-5431a68eebeabf20730eeef6d9f3e12b37c60611.tar.gz irssi-scripts-5431a68eebeabf20730eeef6d9f3e12b37c60611.zip |
Merge branch 'richoH-dev', remote-tracking branch 'origin/richoH-dev'
Diffstat (limited to '')
-rw-r--r-- | auto-server/auto_server.pl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/auto-server/auto_server.pl b/auto-server/auto_server.pl index 8676726..77ba527 100644 --- a/auto-server/auto_server.pl +++ b/auto-server/auto_server.pl @@ -108,7 +108,7 @@ sub parse_channel_map { Irssi::active_win->print("Could not process channel => server mappings"); $channel_map = {}; } - _debug_print Dumper($channel_map); + #_debug_print Dumper($channel_map); bind_completion(); } @@ -150,6 +150,8 @@ sub join_plus { return; } # TODO: search values() and give a 'did you mean' for closest channel + # TODO: Fuzzy match for ## channels (Would be nice to hax at teh tab + # completion too) # check if we're connected to that server my $server = Irssi::server_find_tag($server_id); @@ -177,6 +179,8 @@ sub join_plus { # check if we're already on the required channel my $on_channel = $server->channel_find($channel); + # FIXME + # Should this be $on_channel? Need docs.. if (defined $channel && ref($channel) eq 'Irssi::Irc::Channel') { Irssi::active_win()->print("You are already connected to " . " $channel on " . $server->{tag}); @@ -193,11 +197,14 @@ sub join_plus { _debug_print ("awaiting connection for join"); $pending_joins->{$server_id} = $channel; + # This comes tumbling down if the server doesn't have a MOTD. + # is that RFC required? Irssi::signal_add_last("event 376", 'do_channel_join'); } } sub do_channel_join { + Irssi::signal_remove("event 376", 'do_channel_join'); my ($serv) = @_; #_debug_print("server is " . Dumper($serv)); _debug_print(sprintf("server is %s (%s)", $serv->{address}, $serv->{tag})); |