From dcc6d1ce3a2840c293445b0dbbd509a89b3f92f5 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Tue, 10 May 2016 14:51:08 +0200 Subject: Fix typo --- alternativ_nick.py | 98 ----------------------------------------------------- alternative_nick.py | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 2 +- debian/control | 4 +-- debian/copyright | 2 +- debian/install | 2 +- 6 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 alternativ_nick.py create mode 100644 alternative_nick.py diff --git a/alternativ_nick.py b/alternativ_nick.py deleted file mode 100644 index 9041f21..0000000 --- a/alternativ_nick.py +++ /dev/null @@ -1,98 +0,0 @@ -#!/usr/bin/env python -""" -alternativ_nick.py - Use an alternativ nick, if your choosen nick is already taken -Copyright 2016, Alexander Sulfrian -Licensed under the Eiffel Forum License 2. - -http://inamidst.com/phenny/ -""" - -import sys -import threading - - -# Duration to wait before trying to get the nick again (in seconds) -DEFAULT_NICK_DELAY = 60 - - -def _start_nickloop(phenny): - delay = getattr(phenny.config, 'nick_delay', DEFAULT_NICK_DELAY) - if not isinstance(delay, int): - return - - def nickloop(): - print >> sys.stderr, ('Trying to get: %s' % phenny.config.nick) - phenny.write(('NICK', phenny.config.nick)) - threading.Timer(delay, nickloop).start() - - -def _set_nick(wrapper, nick): - # The phenny argument of the event handler is only a wrapper to enable the - # reply and say methods. If we try to change the 'nick' attribute directly, - # the modification is lost. So we need to get the real phenny instance - # before. - phenny = wrapper.__getattribute__('bot') - phenny.nick = nick - - -def _build_nick(phenny): - # We have different ways to generate an alternativ_nick: - # * First we try to use the config option. - # * If it is not set or it does not work, we append an underscore after the - # default nick. - # * If even this did not work, we append a number and count upwards until a - # valid nick is found. - - alternativ_nick = getattr(phenny.config, 'alternativ_nick', None) - if alternativ_nick is not None and phenny.nick != alternativ_nick: - return alternativ_nick - else: - if phenny.data.get('alternativ_nick.count') is not None: - count = phenny.data['alternativ_nick.count'] - count += 1 - phenny.data['alternativ_nick.count'] = count - return ('%s_%d' % (phenny.config.nick, count)) - else: - phenny.data['alternativ_nick.count'] = 0 - return ('%s_' % phenny.config.nick) - - -def nickname_in_use(phenny, input): - # The nickname in use event can occur during connection phase if the - # supplied nick is already taken, or if we try to get the default nick and - # it is still taken. We remember the connection state, to decide what to - # do. - if phenny.data.get('alternativ_nick.connected'): - _start_nickloop(phenny) - else: - new_nick = _build_nick(phenny) - _set_nick(phenny, new_nick) - phenny.data['alternativ_nick.active'] = True - phenny.write(('NICK', new_nick)) -nickname_in_use.rule = r'(.*)' -nickname_in_use.event = '433' -nickname_in_use.thread = False - - -def nick_change(phenny, input): - # Monitor the NICK changes to detect, if we change our nick. - if input.nick == phenny.nick: - _set_nick(phenny, input) - print >> sys.stderr, ("Changed nick to: %s" % phenny.nick) - - # Trying to identify (just in case it did not work, during startup) - if hasattr(phenny.config, 'password'): - phenny.msg('NickServ', 'IDENTIFY %s' % phenny.config.password) -nick_change.rule = r'(.*)' -nick_change.event = 'NICK' - - -def connected(phenny, input): - # The '001' event is the first message after establishing the connection - # and providing a valid NICK and USER. If we used an alternativ nick, we - # could start trying to get back the default nick. - phenny.data['alternativ_nick.connected'] = True - if phenny.data.get('alternativ_nick.active'): - _start_nickloop(phenny) -connected.rule = r'(.*)' -connected.event = '001' diff --git a/alternative_nick.py b/alternative_nick.py new file mode 100644 index 0000000..66f958c --- /dev/null +++ b/alternative_nick.py @@ -0,0 +1,98 @@ +#!/usr/bin/env python +""" +alternative_nick.py - Use an alternative nick, if your choosen nick is already taken +Copyright 2016, Alexander Sulfrian +Licensed under the Eiffel Forum License 2. + +http://inamidst.com/phenny/ +""" + +import sys +import threading + + +# Duration to wait before trying to get the nick again (in seconds) +DEFAULT_NICK_DELAY = 60 + + +def _start_nickloop(phenny): + delay = getattr(phenny.config, 'nick_delay', DEFAULT_NICK_DELAY) + if not isinstance(delay, int): + return + + def nickloop(): + print >> sys.stderr, ('Trying to get: %s' % phenny.config.nick) + phenny.write(('NICK', phenny.config.nick)) + threading.Timer(delay, nickloop).start() + + +def _set_nick(wrapper, nick): + # The phenny argument of the event handler is only a wrapper to enable the + # reply and say methods. If we try to change the 'nick' attribute directly, + # the modification is lost. So we need to get the real phenny instance + # before. + phenny = wrapper.__getattribute__('bot') + phenny.nick = nick + + +def _build_nick(phenny): + # We have different ways to generate an alternative_nick: + # * First we try to use the config option. + # * If it is not set or it does not work, we append an underscore after the + # default nick. + # * If even this did not work, we append a number and count upwards until a + # valid nick is found. + + alternative_nick = getattr(phenny.config, 'alternative_nick', None) + if alternative_nick is not None and phenny.nick != alternative_nick: + return alternative_nick + else: + if phenny.data.get('alternative_nick.count') is not None: + count = phenny.data['alternative_nick.count'] + count += 1 + phenny.data['alternative_nick.count'] = count + return ('%s_%d' % (phenny.config.nick, count)) + else: + phenny.data['alternative_nick.count'] = 0 + return ('%s_' % phenny.config.nick) + + +def nickname_in_use(phenny, input): + # The nickname in use event can occur during connection phase if the + # supplied nick is already taken, or if we try to get the default nick and + # it is still taken. We remember the connection state, to decide what to + # do. + if phenny.data.get('alternative_nick.connected'): + _start_nickloop(phenny) + else: + new_nick = _build_nick(phenny) + _set_nick(phenny, new_nick) + phenny.data['alternative_nick.active'] = True + phenny.write(('NICK', new_nick)) +nickname_in_use.rule = r'(.*)' +nickname_in_use.event = '433' +nickname_in_use.thread = False + + +def nick_change(phenny, input): + # Monitor the NICK changes to detect, if we change our nick. + if input.nick == phenny.nick: + _set_nick(phenny, input) + print >> sys.stderr, ("Changed nick to: %s" % phenny.nick) + + # Trying to identify (just in case it did not work, during startup) + if hasattr(phenny.config, 'password'): + phenny.msg('NickServ', 'IDENTIFY %s' % phenny.config.password) +nick_change.rule = r'(.*)' +nick_change.event = 'NICK' + + +def connected(phenny, input): + # The '001' event is the first message after establishing the connection + # and providing a valid NICK and USER. If we used an alternativ nick, we + # could start trying to get back the default nick. + phenny.data['alternative_nick.connected'] = True + if phenny.data.get('alternative_nick.active'): + _start_nickloop(phenny) +connected.rule = r'(.*)' +connected.event = '001' diff --git a/debian/changelog b/debian/changelog index e971ee6..2b56c53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -phenny-module-alternativ-nick (0.1) UNRELEASED; urgency=low +phenny-module-alternative-nick (0.1) UNRELEASED; urgency=low * Initial release. diff --git a/debian/control b/debian/control index 3bda754..0cac883 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: phenny-module-alternativ-nick +Source: phenny-module-alternative-nick Section: python Priority: optional Maintainer: Alexander Sulfrian @@ -7,7 +7,7 @@ Standards-Version: 3.8.3 Build-Depends: debhelper (>= 7.2.11) Homepage: http://inamidst.com/phenny/ -Package: phenny-module-alternativ-nick +Package: phenny-module-alternative-nick Architecture: all Depends: ${misc:Depends}, phenny Description: alternativ nick module for phenny diff --git a/debian/copyright b/debian/copyright index f8739d7..bcf6330 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ This work was packaged for Debian by: It was downloaded from: - http://git.spline.inf.fu-berlin.de/phenny/modules/alternativ-nick/ + http://git.spline.inf.fu-berlin.de/phenny/modules/alternative-nick/ Upstream Author(s): diff --git a/debian/install b/debian/install index 3a0cbb9..ec05e32 100644 --- a/debian/install +++ b/debian/install @@ -1 +1 @@ -alternativ_nick.py usr/share/phenny/modules/alternativ-nick/ +alternative_nick.py usr/share/phenny/modules/alternative-nick/ -- cgit v1.2.3-1-g7c22