home
·
contact
·
privacy
projects
/
plomlombot-irc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove special handling of 353.
[plomlombot-irc.git]
/
plomlombot.py
diff --git
a/plomlombot.py
b/plomlombot.py
index 7bf2208ab94a71774b4f1b7c6a49cf0e58661ad0..7f412ea63d5505e11f68b90893c515cbdbe129e4 100755
(executable)
--- a/
plomlombot.py
+++ b/
plomlombot.py
@@
-20,6
+20,7
@@
TIMEOUT = 240
USERNAME = "plomlombot"
NICKNAME = USERNAME
TWTFILE = ""
USERNAME = "plomlombot"
NICKNAME = USERNAME
TWTFILE = ""
+DBDIR = os.path.expanduser("~/plomlombot_db")
class ExceptionForRestart(Exception):
class ExceptionForRestart(Exception):
@@
-96,7
+97,7
@@
class IO:
def handle_command(command, argument, notice, target, session):
hash_string = hashlib.md5(target.encode("utf-8")).hexdigest()
def handle_command(command, argument, notice, target, session):
hash_string = hashlib.md5(target.encode("utf-8")).hexdigest()
- quotesfile_name =
"
quotes_" + hash_string
+ quotesfile_name =
session.dbdir + "/
quotes_" + hash_string
def addquote():
if not os.access(quotesfile_name, os.F_OK):
def addquote():
if not os.access(quotesfile_name, os.F_OK):
@@
-162,7
+163,7
@@
def handle_command(command, argument, notice, target, session):
notice("QUOTE #" + str(i + 1) + ": " + lines[i])
def markov():
notice("QUOTE #" + str(i + 1) + ": " + lines[i])
def markov():
- from random import choice
+ from random import choice
, shuffle
select_length = 2
selections = []
select_length = 2
selections = []
@@
-186,7
+187,7
@@
def handle_command(command, argument, notice, target, session):
return selection[select_length]
hash_string = hashlib.md5(target.encode("utf-8")).hexdigest()
return selection[select_length]
hash_string = hashlib.md5(target.encode("utf-8")).hexdigest()
- markovfeed_name =
"
markovfeed_" + hash_string
+ markovfeed_name =
session.dbdir + "/
markovfeed_" + hash_string
if not os.access(markovfeed_name, os.F_OK):
notice("NOT ENOUGH TEXT TO MARKOV.")
return
if not os.access(markovfeed_name, os.F_OK):
notice("NOT ENOUGH TEXT TO MARKOV.")
return
@@
-196,9
+197,10
@@
def handle_command(command, argument, notice, target, session):
lines = file.readlines()
file.close()
tokens = []
lines = file.readlines()
file.close()
tokens = []
+ sentence_end_markers = ".!?)("
for line in lines:
line = line.lower().replace("\n", "")
for line in lines:
line = line.lower().replace("\n", "")
- if line[-1] not in
".!?"
:
+ if line[-1] not in
sentence_end_markers
:
line += "."
tokens += line.split()
if len(tokens) <= select_length:
line += "."
tokens += line.split()
if len(tokens) <= select_length:
@@
-225,6
+227,7
@@
def handle_command(command, argument, notice, target, session):
# For each snippet of select_length, use markov() to find continuation
# token from selections. Replace present users' names with malkovich.
# For each snippet of select_length, use markov() to find continuation
# token from selections. Replace present users' names with malkovich.
+ # Start snippets with the beginning of a sentence, if possible.
for i in range(len(tokens) - select_length):
token_list = []
for j in range(select_length + 1):
for i in range(len(tokens) - select_length):
token_list = []
for j in range(select_length + 1):
@@
-233,6
+236,12
@@
def handle_command(command, argument, notice, target, session):
snippet = []
for i in range(select_length):
snippet += [""]
snippet = []
for i in range(select_length):
snippet += [""]
+ shuffle(selections)
+ for i in range(len(selections)):
+ if selections[i][0][-1] in sentence_end_markers:
+ for i in range(select_length):
+ snippet[i] = selections[i][i + 1]
+ break
msg = ""
malkovich = "malkovich"
while 1:
msg = ""
malkovich = "malkovich"
while 1:
@@
-314,8
+323,8
@@
def handle_url(url, notice, show_url=False):
return
if mobile_twitter_hack(url):
return
return
if mobile_twitter_hack(url):
return
- title = bs4.BeautifulSoup(r.text, "html
.parser
").title
- if title:
+ title = bs4.BeautifulSoup(r.text, "html
5lib
").title
+ if title
and title.string
:
prefix = "PAGE TITLE: "
if show_url:
prefix = "PAGE TITLE FOR <" + url + ">: "
prefix = "PAGE TITLE: "
if show_url:
prefix = "PAGE TITLE FOR <" + url + ">: "
@@
-326,18
+335,30
@@
def handle_url(url, notice, show_url=False):
class Session:
class Session:
- def __init__(self, io, username, nickname, channel, twtfile):
+ def __init__(self, io, username, nickname, channel, twtfile
, dbdir
):
self.io = io
self.nickname = nickname
self.channel = channel
self.users_in_chan = []
self.twtfile = twtfile
self.io = io
self.nickname = nickname
self.channel = channel
self.users_in_chan = []
self.twtfile = twtfile
+ self.dbdir = dbdir
self.io.send_line("NICK " + self.nickname)
self.io.send_line("USER " + username + " 0 * : ")
self.io.send_line("JOIN " + self.channel)
self.io.send_line("NICK " + self.nickname)
self.io.send_line("USER " + username + " 0 * : ")
self.io.send_line("JOIN " + self.channel)
+ hash_string = hashlib.md5(self.channel.encode("utf-8")).hexdigest()
+ self.logdir = self.dbdir + "/irclogs_" + hash_string + "/"
+ if not os.path.exists(self.logdir):
+ os.makedirs(self.logdir)
def loop(self):
def loop(self):
+ def log(line):
+ now = datetime.datetime.utcnow()
+ logfile = open(self.logdir + now.strftime("%Y-%m-%d") + ".txt", "a")
+ form = "%Y-%m-%d %H:%M:%S UTC\t"
+ logfile.write(now.strftime(form) + " " + line + "\n")
+ logfile.close()
+
def handle_privmsg(tokens):
def handle_input(msg, target):
def handle_privmsg(tokens):
def handle_input(msg, target):
@@
-354,7
+375,7
@@
class Session:
handle_command(tokens[0], argument, notice, target, self)
return
hash_string = hashlib.md5(target.encode("utf-8")).hexdigest()
handle_command(tokens[0], argument, notice, target, self)
return
hash_string = hashlib.md5(target.encode("utf-8")).hexdigest()
- markovfeed_name =
"
markovfeed_" + hash_string
+ markovfeed_name =
self.dbdir + "/
markovfeed_" + hash_string
file = open(markovfeed_name, "a")
file.write(msg + "\n")
file.close()
file = open(markovfeed_name, "a")
file.write(msg + "\n")
file.close()
@@
-375,6
+396,8
@@
class Session:
if receiver != self.nickname:
target = receiver
msg = str.join(" ", tokens[3:])[1:]
if receiver != self.nickname:
target = receiver
msg = str.join(" ", tokens[3:])[1:]
+ if target == self.channel:
+ log("<" + sender + "> " + msg)
handle_input(msg, target)
def name_from_join_or_part(tokens):
handle_input(msg, target)
def name_from_join_or_part(tokens):
@@
-398,14
+421,22
@@
class Session:
elif tokens[1] == "353":
names = tokens[5:]
names[0] = names[0][1:]
elif tokens[1] == "353":
names = tokens[5:]
names[0] = names[0][1:]
+ for i in range(len(names)):
+ names[i] = names[i].replace("@", "").replace("+", "")
self.users_in_chan += names
self.users_in_chan += names
+ log(line)
elif tokens[1] == "JOIN":
name = name_from_join_or_part(tokens)
if name != self.nickname:
self.users_in_chan += [name]
elif tokens[1] == "JOIN":
name = name_from_join_or_part(tokens)
if name != self.nickname:
self.users_in_chan += [name]
+ log(line)
elif tokens[1] == "PART":
name = name_from_join_or_part(tokens)
del(self.users_in_chan[self.users_in_chan.index(name)])
elif tokens[1] == "PART":
name = name_from_join_or_part(tokens)
del(self.users_in_chan[self.users_in_chan.index(name)])
+ log(line)
+ else:
+ log(line)
+
def parse_command_line_arguments():
parser = argparse.ArgumentParser()
def parse_command_line_arguments():
parser = argparse.ArgumentParser()
@@
-426,9
+457,11
@@
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("-n, --nickname", action="store", dest="nickname",
default=NICKNAME, help="nickname to use (default: "
+ NICKNAME + ")")
- parser.add_argument("-t, --twtfile", action="store", dest="twtfile",
- default=TWTFILE, help="twtfile to use (default: "
+ parser.add_argument("-t, --twt
xt
file", action="store", dest="twtfile",
+ default=TWTFILE, help="twt
xt
file to use (default: "
+ TWTFILE + ")")
+ TWTFILE + ")")
+ parser.add_argument("-d, --dbdir", action="store", dest="dbdir",
+ default=DBDIR, help="directory to store DB files in")
parser.add_argument("CHANNEL", action="store", help="channel to join")
opts, unknown = parser.parse_known_args()
return opts
parser.add_argument("CHANNEL", action="store", help="channel to join")
opts, unknown = parser.parse_known_args()
return opts
@@
-439,7
+472,7
@@
while True:
try:
io = IO(opts.server, opts.port, opts.timeout)
session = Session(io, opts.username, opts.nickname, opts.CHANNEL,
try:
io = IO(opts.server, opts.port, opts.timeout)
session = Session(io, opts.username, opts.nickname, opts.CHANNEL,
- opts.twtfile)
+ opts.twtfile
, opts.dbdir
)
session.loop()
except ExceptionForRestart:
io.socket.close()
session.loop()
except ExceptionForRestart:
io.socket.close()