X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/fd07173df3e9070bac1a0cf79c729f14c781d799..0ce8eacc0e06bd3ab29fdf5d9dc8f958abd1a2a6:/modules/userinfo.py

diff --git a/modules/userinfo.py b/modules/userinfo.py
index bd15053..15abad1 100644
--- a/modules/userinfo.py
+++ b/modules/userinfo.py
@@ -6,7 +6,7 @@
 modinfo = {
 	'author': 'Erebus Team',
 	'license': 'public domain',
-	'compatible': [1,2],
+	'compatible': [0],
 	'depends': [],
 	'softdeps': ['help'],
 }
@@ -20,7 +20,7 @@ def modstart(parent_arg, *args, **kwargs):
 	gotParent()
 	return lib.modstart(parent, *args, **kwargs)
 def modstop(*args, **kwargs):
-	closeshop()
+	savedb()
 	return lib.modstop(*args, **kwargs)
 
 # module code
@@ -34,12 +34,12 @@ def gotParent():
 		db = json.load(open(jsonfile, "r"))
 	except:
 		db = {}
-def closeshop():
+def savedb():
 	if json is not None and json.dump is not None and db != {}:
 		json.dump(db, open(jsonfile, "w"))#, indent=4, separators=(',', ': '))
 
 #functions
-def getauth(thing):
+def _getauth(thing):
 	if isinstance(thing, parent.User):
 		if thing.auth is not None:
 			return "#"+thing.auth
@@ -52,30 +52,41 @@ def getauth(thing):
 	return None
 
 def _keys(user):
-	return list(set(db.get(getauth(user), {}).keys() + db.get(str(user).lower(), {}).keys())) #list-to-set-to-list to remove duplicates
+	return list(set(db.get(_getauth(user), {}).keys() + db.get(str(user).lower(), {}).keys())) #list-to-set-to-list to remove duplicates
 def _has(user, key):
+	key = key.lower()
 	return (
-		key in db.get(getauth(user), {}) or
+		key in db.get(_getauth(user), {}) or
 		key in db.get(str(user).lower(), {})
 	)
 def _get(user, key, default=None):
+	key = key.lower()
 	return (
-		db.get(getauth(user), {}). #try to get the auth
+		db.get(_getauth(user), {}). #try to get the auth
 			get(key, #try to get the info-key by auth
 			db.get(str(user).lower(), {}). #fallback to using the nick
 				get(key, #and try to get the info-key from that
 				default #otherwise throw out whatever default
 	)))
 def _set(user, key, value):
-	if getauth(user) is not None:
-		db.setdefault(getauth(user), {})[key] = value #use auth if we can
+	key = key.lower()
+	if _getauth(user) is not None:
+		db.setdefault(_getauth(user), {})[key] = value #use auth if we can
 	db.setdefault(str(user).lower(), {})[key] = value #but set nick too
+def _del(user, key):
+	key = key.lower()
+	auth = _getauth(user)
+	if auth is not None and auth in db and key in db[auth]:
+		del db[auth][key]
+	target = str(user).lower()
+	if target in db and key in db[target]:
+		del db[target][key]
 
 #commands
-@lib.hook(needchan=False)
+@lib.hook(needchan=False, wantchan=True)
 @lib.help("[<target>]", "lists info items known about someone", "<target> may be a nick, or an auth in format '#auth'", "it defaults to yourself")
 def getitems(bot, user, chan, realtarget, *args):
-	if chan is not None and realtarget == chan.name: replyto = chan
+	if chan is not None: replyto = chan
 	else: replyto = user
 
 	if len(args) > 0:
@@ -85,11 +96,11 @@ def getitems(bot, user, chan, realtarget, *args):
 
 	bot.msg(replyto, "%(user)s: %(target)s has the following info items: %(items)s" % {'user':user,'target':target,'items':(', '.join(_keys(target)))})
 
-@lib.hook(needchan=False)
+@lib.hook(needchan=False, wantchan=True)
 @lib.help("[<target>] <item>", "gets an info item about someone", "<target> may be a nick, or an auth in format '#auth'", "it defaults to yourself")
 @lib.argsGE(1)
 def getinfo(bot, user, chan, realtarget, *args):
-	if chan is not None and realtarget == chan.name: replyto = chan
+	if chan is not None: replyto = chan
 	else: replyto = user
 
 	if len(args) > 1:
@@ -110,13 +121,29 @@ def getinfo(bot, user, chan, realtarget, *args):
 @lib.argsGE(2)
 def setinfo(bot, user, chan, realtarget, *args):
 	_set(user, args[0], ' '.join(args[1:]))
-	closeshop()
+	savedb()
 	bot.msg(user, "Done.")
 
-@lib.hook(glevel=lib.STAFF, needchan=False)
+@lib.hook(needchan=False)
+@lib.help("<item>", "deletes an info item about you")
+@lib.argsEQ(1)
+def delinfo(bot, user, chan, realtarget, *args):
+	_del(user, args[0])
+	savedb()
+	bot.msg(user, "Done.")
+
+@lib.hook(glevel=lib.ADMIN, needchan=False)
 @lib.help("<target> <item> <value>", "sets an info item about someone else", "<target> may be a nick, or an auth in format '#auth'")
 @lib.argsGE(3)
 def osetinfo(bot, user, chan, realtarget, *args):
 	_set(args[0], args[1], ' '.join(args[2:]))
-	closeshop()
+	savedb()
+	bot.msg(user, "Done.")
+
+@lib.hook(glevel=lib.STAFF, needchan=False)
+@lib.help("<target> <item>", "deletes an info item about someone else", "<target> may be a nick, or an auth in format '#auth'")
+@lib.argsEQ(2)
+def odelinfo(bot, user, chan, realtarget, *args):
+	_del(args[0], args[1])
+	savedb()
 	bot.msg(user, "Done.")