From: Christian Heller Date: Fri, 26 Jun 2020 18:48:44 +0000 (+0200) Subject: Add option to suppress URL parsing for page title showing. X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/static/%7B%7Bdb.prefix%7D%7D/ledger?a=commitdiff_plain;h=7d387b03c6841ad7efa790f7b4b1b61c90188d64;p=plomlombot-irc.git Add option to suppress URL parsing for page title showing. --- diff --git a/plomlombot.py b/plomlombot.py index 8e2657c..9aa7045 100755 --- a/plomlombot.py +++ b/plomlombot.py @@ -471,7 +471,7 @@ def handle_url(url, notice, show_url=False): class Session: def __init__(self, io, username, nickname, channel, twtfile, dbdir, rmlogs, - markov_input): + markov_input, no_show_page_titles): self.io = io self.nickname = nickname self.users_in_chan = [] @@ -487,6 +487,7 @@ class Session: 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 +501,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:]) @@ -574,6 +576,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("--no-show-page-titles", action="store_true", + dest="no_show_page_titles", + help="do not show page titles") parser.add_argument("CHANNEL", action="store", help="channel to join") opts, unknown = parser.parse_known_args() return opts @@ -586,7 +591,8 @@ while True: 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) + opts.twtfile, dbdir, opts.rmlogs, opts.markov_store, + opts.no_show_page_titles) session.loop() except ExceptionForRestart: io.socket.close()