Make default irc color none; add color none

reviewable/pr18780/r1
Nick Irvine 11 years ago
parent ecf78e8c93
commit 0a195f0880

@ -51,8 +51,8 @@ options:
description: description:
- Text color for the message. Default is black. - Text color for the message. Default is black.
required: false required: false
default: black default: none
choices: [ "yellow", "red", "green", "blue", "black" ] choices: [ "none", "yellow", "red", "green", "blue", "black" ]
channel: channel:
description: description:
- Channel name - Channel name
@ -94,7 +94,7 @@ from time import sleep
def send_msg(channel, msg, server='localhost', port='6667', def send_msg(channel, msg, server='localhost', port='6667',
nick="ansible", color='black', passwd=False, timeout=30): nick="ansible", color='none', passwd=False, timeout=30):
'''send message to IRC''' '''send message to IRC'''
colornumbers = { colornumbers = {
@ -107,10 +107,11 @@ def send_msg(channel, msg, server='localhost', port='6667',
try: try:
colornumber = colornumbers[color] colornumber = colornumbers[color]
colortext = "\x03" + colornumber
except: except:
colornumber = "01" # black colortext = ""
message = "\x03" + colornumber + msg message = colortext + msg
irc = socket.socket(socket.AF_INET, socket.SOCK_STREAM) irc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
irc.connect((server, int(port))) irc.connect((server, int(port)))
@ -158,8 +159,8 @@ def main():
port=dict(default=6667), port=dict(default=6667),
nick=dict(default='ansible'), nick=dict(default='ansible'),
msg=dict(required=True), msg=dict(required=True),
color=dict(default="black", choices=["yellow", "red", "green", color=dict(default="none", choices=["yellow", "red", "green",
"blue", "black"]), "blue", "black", "none"]),
channel=dict(required=True), channel=dict(required=True),
passwd=dict(), passwd=dict(),
timeout=dict(type='int', default=30) timeout=dict(type='int', default=30)

Loading…
Cancel
Save