mirror of https://github.com/str4d/RelayBot.git
Remove silent option and join/part/quit/rename messages.
This commit is contained in:
parent
b9d92a97b5
commit
006ca10d90
27
relaybot.py
27
relaybot.py
|
@ -38,7 +38,7 @@ def main():
|
||||||
return None
|
return None
|
||||||
|
|
||||||
options = {}
|
options = {}
|
||||||
for option in [ "timeout", "host", "port", "nick", "channel", "heartbeat", "password", "username", "realname", "mode", "ssl", "fingerprint", "silent" ]:
|
for option in [ "timeout", "host", "port", "nick", "channel", "heartbeat", "password", "username", "realname", "mode", "ssl", "fingerprint" ]:
|
||||||
options[option] = get(option)
|
options[option] = get(option)
|
||||||
|
|
||||||
mode = get("mode")
|
mode = get("mode")
|
||||||
|
@ -207,7 +207,6 @@ class IRCRelayer(irc.IRCClient):
|
||||||
self.username = config['username']
|
self.username = config['username']
|
||||||
self.realname = config['realname']
|
self.realname = config['realname']
|
||||||
self.mode = config['mode']
|
self.mode = config['mode']
|
||||||
self.silent = config['silent']
|
|
||||||
self.colornick = "\x0303"
|
self.colornick = "\x0303"
|
||||||
self.colorend = "\x03"
|
self.colorend = "\x03"
|
||||||
log.msg("IRC Relay created. Name: %s | Host: %s | Channel: %s"%(self.nickname, self.network, self.channel))
|
log.msg("IRC Relay created. Name: %s | Host: %s | Channel: %s"%(self.nickname, self.network, self.channel))
|
||||||
|
@ -254,36 +253,12 @@ class IRCRelayer(irc.IRCClient):
|
||||||
log.msg("Kicked by %s. Message \"%s\""%(kicker, message))
|
log.msg("Kicked by %s. Message \"%s\""%(kicker, message))
|
||||||
communicator.unregister(self)
|
communicator.unregister(self)
|
||||||
|
|
||||||
def userJoined(self, user, channel):
|
|
||||||
if self.silent != "True":
|
|
||||||
self.relay("%s joined."%self.formatUsername(user))
|
|
||||||
else:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def userLeft(self, user, channel):
|
|
||||||
if self.silent != "True":
|
|
||||||
self.relay("%s left."%self.formatUsername(user))
|
|
||||||
else:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def userQuit(self, user, quitMessage):
|
|
||||||
if self.silent != "True":
|
|
||||||
self.relay("%s quit. (%s)"%(self.formatUsername(user), quitMessage))
|
|
||||||
else:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def action(self, user, channel, data):
|
def action(self, user, channel, data):
|
||||||
if self.mode != "RelayByCommand":
|
if self.mode != "RelayByCommand":
|
||||||
self.relay("* %s %s"%(self.formatUsername(user), data))
|
self.relay("* %s %s"%(self.formatUsername(user), data))
|
||||||
else:
|
else:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def userRenamed(self, oldname, newname):
|
|
||||||
if self.silent != "True":
|
|
||||||
self.relay("%s is now known as %s."%(self.formatUsername(oldname), self.formatUsername(newname)))
|
|
||||||
else:
|
|
||||||
pass
|
|
||||||
|
|
||||||
class RelayFactory(ReconnectingClientFactory):
|
class RelayFactory(ReconnectingClientFactory):
|
||||||
protocol = IRCRelayer
|
protocol = IRCRelayer
|
||||||
#Log information which includes reconnection status.
|
#Log information which includes reconnection status.
|
||||||
|
|
Loading…
Reference in New Issue