X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=9da116646679d15cb582a18e21ffb6026512361e;hp=c1c23089ba01450ef5f2cd686f000580e44398cb;hb=e10a95326b89d24d6f598f3b7dced59150c2fceb;hpb=0358a1448b3b715454461917cb2570f97ff44317

diff --git a/plomlombot.py b/plomlombot.py
index c1c2308..9da1166 100755
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -6,9 +6,11 @@ import datetime
 import select
 import time
 import re
-import urllib.request
-import http.client
-import html
+import requests
+import bs4
+import random
+import hashlib
+import os
 
 # Defaults, may be overwritten by command line arguments.
 SERVER = "irc.freenode.net"
@@ -67,7 +69,11 @@ class IO:
                 self._pingtest(send_ping)
                 return None
             self.last_pong = time.time()
-            received_runes = self.socket.recv(1024).decode("UTF-8")
+            received_bytes = self.socket.recv(1024)
+            try:
+                received_runes = received_bytes.decode("UTF-8")
+            except UnicodeDecodeError:
+                received_runes = received_bytes.decode("latin1")
             if len(received_runes) == 0:
                 print("SOCKET CONNECTION BROKEN")
                 raise ExceptionForRestart
@@ -99,30 +105,54 @@ def lineparser_loop(io, nickname):
 
     def act_on_privmsg(tokens):
 
+        def notice(msg):
+            io.send_line("NOTICE " + target + " :" + msg)
+
         def url_check(msg):
-            matches = re.findall("(https?://[^\s]+)", msg)
+            matches = re.findall("(https?://[^\s>]+)", msg)
             for i in range(len(matches)):
                 url = matches[i]
                 try:
-                    webpage = urllib.request.urlopen(url, timeout=15)
-                except (urllib.error.HTTPError, urllib.error.URLError,
-                        UnicodeError, http.client.BadStatusLine) as error:
-                    print("TROUBLE FOLLOWING URL: " + str(error))
-                    continue
-                charset = webpage.info().get_content_charset()
-                if not charset:
-                    charset = "utf-8"
-                content_type = webpage.info().get_content_type()
-                if content_type not in ('text/html', 'text/xml',
-                                        'application/xhtml+xml'):
-                    print("TROUBLE INTERPRETING URL: bad content type "
-                          + content_type)
+                    r = requests.get(url, timeout=15)
+                except (requests.exceptions.TooManyRedirects,
+                        requests.exceptions.ConnectionError,
+                        requests.exceptions.InvalidURL,
+                        requests.exceptions.InvalidSchema) as error:
+                    notice("TROUBLE FOLLOWING URL: " + str(error))
                     continue
-                content = webpage.read().decode(charset)
-                title = str(content).split('<title>')[1].split('</title>')[0]
-                title = html.unescape(title)
-                io.send_line("PRIVMSG " + target + " :page title for url: "
-                             + title)
+                title = bs4.BeautifulSoup(r.text).title
+                if title:
+                    notice("PAGE TITLE: " + title.string.strip())
+                else:
+                    notice("PAGE HAS NO TITLE TAG")
+
+        def command_check(msg):
+            if msg[0] != "!":
+                return
+            tokens = msg[1:].split()
+            hash_string = hashlib.md5(target.encode("utf-8")).hexdigest()
+            quotesfile_name = "quotes_" + hash_string
+            if tokens[0] == "addquote":
+                if not os.access(quotesfile_name, os.F_OK):
+                    quotesfile = open(quotesfile_name, "w")
+                    quotesfile.write("QUOTES FOR " + target + ":\n")
+                    quotesfile.close()
+                quotesfile = open(quotesfile_name, "a")
+                quotesfile.write(str.join(" ", tokens[1:]) + "\n")
+                quotesfile.close()
+                quotesfile = open(quotesfile_name, "r")
+                lines = quotesfile.readlines()
+                quotesfile.close()
+                notice("ADDED QUOTE #" + str(len(lines) - 1))
+            elif tokens[0] == "quote":
+                if not os.access(quotesfile_name, os.F_OK):
+                    notice("NO QUOTES AVAILABLE")
+                    return
+                quotesfile = open(quotesfile_name, "r")
+                lines = quotesfile.readlines()
+                quotesfile.close()
+                i = random.randrange(len(lines) - 1) + 1
+                notice("QUOTE #" + str(i) + ": " + lines[i])
 
         sender = ""
         for rune in tokens[0]:
@@ -140,6 +170,7 @@ def lineparser_loop(io, nickname):
         if receiver != nickname:
             target = receiver
         msg = str.join(" ", tokens[3:])[1:]
+        command_check(msg)
         url_check(msg)
 
     while True: