Skip to content
Browse files

Merge pull request #1 from killerrabbit/master

Take into account &(local) channels.
  • Loading branch information...
2 parents e6358a9 + 56c7228 commit 3bd64b0627251a94a21064d806f52f8d9c749fba @FiXato committed Feb 14, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 clone_scanner.py
View
4 clone_scanner.py
@@ -227,7 +227,7 @@ def format_from_config(msg, config_option):
def on_join_scan_cb(data, signal, signal_data):
network = signal.split(',')[0]
joined_nick = weechat.info_get("irc_nick_from_host", signal_data)
- join_match_data = re.match(':[^!]+!([^@]+@(\S+)) JOIN :?(#\S+)', signal_data)
+ join_match_data = re.match(':[^!]+!([^@]+@(\S+)) JOIN :?([#&]\S+)', signal_data)
parsed_ident_host = join_match_data.group(1).lower()
parsed_host = join_match_data.group(2).lower()
if weechat.config_get_plugin("compare_idents") == "on":
@@ -312,7 +312,7 @@ def get_channel_from_buffer_args(buffer, args):
if not channel_name:
channel_name = weechat.buffer_get_string(buffer, "localvar_channel")
- match_data = re.match('\A(irc.)?([^.]+)\.(#\S+)\Z', channel_name)
+ match_data = re.match('\A(irc.)?([^.]+)\.([#&]\S+)\Z', channel_name)
if match_data:
channel_name = match_data.group(3)
server_name = match_data.group(2)

0 comments on commit 3bd64b0

Please sign in to comment.
Something went wrong with that request. Please try again.