X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomlombot.py;h=0e02f1c6dd426b60a380e8cb14dd02b43e992424;hb=920a2af71ebc064d5c0ae8b1700814a63ab4f6c1;hp=7f3d4e5d2984bf89054be0f47c4787777a07e94f;hpb=c48adc4bf2c4eb6e3370b53212bcc7f43385944a;p=plomlombot-irc.git
diff --git a/plomlombot.py b/plomlombot.py
index 7f3d4e5..0e02f1c 100755
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -17,6 +17,7 @@ import irclog
# Defaults, may be overwritten by command line arguments.
SERVER = "irc.freenode.net"
+CHANNEL = "#plomlombot-test"
PORT = 6667
TIMEOUT = 240
USERNAME = "plomlombot"
@@ -214,13 +215,13 @@ def handle_command(command, argument, notice, target, session):
tokens = []
else:
tokens = argument.split(" ")
- if len(tokens) != 0:
- if (len(tokens) == 1 and not tokens[0].isdigit()) or \
- tokens[0] not in {"search", "offset-search"} or \
- (tokens[0] == "offset-search" and
- ((not len(tokens) > 2) or (not tokens[1].isdigit()))):
- help()
- return
+ if (len(tokens) == 1 and not tokens[0].isdigit()) or \
+ (len(tokens) > 1 and
+ (tokens[0] not in {"search", "offset-search"} or
+ (tokens[0] == "offset-search" and
+ ((not len(tokens) > 2) or (not tokens[1].isdigit()))))):
+ help()
+ return
if not os.access(session.quotesfile, os.F_OK):
notice("no quotes available")
return
@@ -470,8 +471,9 @@ def handle_url(url, notice, show_url=False):
class Session:
- def __init__(self, io, username, nickname, channel, twtfile, dbdir, rmlogs,
- markov_input):
+ def __init__(self, io, username, nickname, sasl, channel, twtfile, dbdir, rmlogs,
+ markov_input, no_show_page_titles):
+ import base64
self.io = io
self.nickname = nickname
self.users_in_chan = []
@@ -482,11 +484,20 @@ class Session:
self.markovfile = chandir + "markovfeed"
self.quotesfile = chandir + "quotes"
self.log = Log(chandir, self.nickname, username, channel, rmlogs)
+ if sasl:
+ self.io.send_line("CAP REQ :sasl")
self.io.send_line("NICK " + self.nickname)
self.io.send_line("USER " + username + " 0 * : ")
+ if sasl:
+ self.io.send_line("AUTHENTICATE PLAIN")
+ auth = username + '\0' + username + '\0' + sasl
+ auth_encoded = base64.b64encode(auth.encode()).decode().rstrip()
+ self.io.send_line("AUTHENTICATE " + auth_encoded)
+ self.io.send_line("CAP END")
self.io.send_line("JOIN " + channel)
self.io.log = self.log
self.log.separator_line()
+ self.show_page_titles = not no_show_page_titles
def loop(self):
@@ -500,15 +511,16 @@ class Session:
if line.receiver != self.nickname:
target = line.receiver
msg = str.join(" ", line.tokens[3:])[1:]
- matches = re.findall("(https?://[^\s>]+)", msg)
- url_count = 0
- for i in range(len(matches)):
- if handle_url(matches[i], notice):
- url_count += 1
- if url_count == 3:
- notice("maximum number of urls to parse per message "
- "reached")
- break
+ if self.show_page_titles:
+ matches = re.findall("(https?://[^\s>]+)", msg)
+ url_count = 0
+ for i in range(len(matches)):
+ if handle_url(matches[i], notice):
+ url_count += 1
+ if url_count == 3:
+ notice("maximum number of urls to parse per "
+ "message reached")
+ break
if "!" == msg[0] and len(msg) > 1:
tokens = msg[1:].split()
argument = str.join(" ", tokens[1:])
@@ -552,6 +564,8 @@ def parse_command_line_arguments():
parser.add_argument("-p, --port", action="store", dest="port", type=int,
default=PORT, help="port to connect to (default : "
+ str(PORT) + ")")
+ parser.add_argument("-c, --channel", action="store", dest="channel",
+ default=SERVER, help="channel to join")
parser.add_argument("-w, --wait", action="store", dest="timeout",
type=int, default=TIMEOUT,
help="timeout in seconds after which to attempt "
@@ -562,6 +576,8 @@ def parse_command_line_arguments():
parser.add_argument("-n, --nickname", action="store", dest="nickname",
default=NICKNAME, help="nickname to use (default: "
+ NICKNAME + ")")
+ parser.add_argument("-a, --authenticate", action="store", dest="sasl",
+ default=None, help="SASL password (default: none)")
parser.add_argument("-t, --twtxtfile", action="store", dest="twtfile",
default=TWTFILE, help="twtxt file to use (default: "
+ TWTFILE + ")")
@@ -574,7 +590,9 @@ def parse_command_line_arguments():
parser.add_argument("-m, --markov_store", action="store_true",
dest="markov_store",
help="log channel discussions for !markov input")
- parser.add_argument("CHANNEL", action="store", help="channel to join")
+ parser.add_argument("--no-show-page-titles", action="store_true",
+ dest="no_show_page_titles",
+ help="do not show page titles")
opts, unknown = parser.parse_known_args()
return opts
@@ -585,8 +603,9 @@ while True:
io = IO(opts.server, opts.port, opts.timeout)
hash_server = hashlib.md5(opts.server.encode("utf-8")).hexdigest()
dbdir = opts.dbdir + "/" + hash_server
- session = Session(io, opts.username, opts.nickname, opts.CHANNEL,
- opts.twtfile, dbdir, opts.rmlogs, opts.markov_store)
+ session = Session(io, opts.username, opts.nickname, opts.sasl, opts.channel,
+ opts.twtfile, dbdir, opts.rmlogs, opts.markov_store,
+ opts.no_show_page_titles)
session.loop()
except ExceptionForRestart:
io.socket.close()