From: zonidjan <redacted>
Date: Fri, 17 Aug 2018 23:06:17 +0000 (-0500)
Subject: userinfo - remove _ from keys/has/get/set/delete
X-Git-Url: https://jfr.im/git/erebus.git/commitdiff_plain/aa582dd7c3e4c1e02c6dd6f04b47db59e58578cc?ds=sidebyside;hp=96dfdcd3388fede51b41e1e7094c28f6ff2d4715

userinfo - remove _ from keys/has/get/set/delete
---

diff --git a/modules/trivia.py b/modules/trivia.py
index 3e79db3..c55d19a 100644
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -65,7 +65,7 @@ def pts(num):
 		return 0
 
 def country(num, default="??"):
-	return lib.mod('userinfo')._get(person(num), 'country', default=default).upper()
+	return lib.mod('userinfo').get(person(num), 'country', default=default).upper()
 
 class MyTimer(timerbase):
 	def __init__(self, *args, **kwargs):
diff --git a/modules/userinfo.py b/modules/userinfo.py
index e0df42a..65580f8 100644
--- a/modules/userinfo.py
+++ b/modules/userinfo.py
@@ -53,15 +53,15 @@ def _getauth(thing):
 				return "#"+parent.user(thing).auth
 	return None
 
-def _keys(user):
+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
-def _has(user, key):
+def has(user, key):
 	key = key.lower()
 	return (
 		key in db.get(_getauth(user), {}) or
 		key in db.get(str(user).lower(), {})
 	)
-def _get(user, key, default=None):
+def get(user, key, default=None):
 	key = key.lower()
 	return (
 		db.get(_getauth(user), {}). #try to get the auth
@@ -70,12 +70,12 @@ def _get(user, key, default=None):
 				get(key, #and try to get the info-key from that
 				default #otherwise throw out whatever default
 	)))
-def _set(user, key, value):
+def set(user, key, value):
 	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):
+def delete(user, key):
 	key = key.lower()
 	auth = _getauth(user)
 	if auth is not None and auth in db and key in db[auth]:
@@ -96,7 +96,7 @@ def getitems(bot, user, chan, realtarget, *args):
 	else:
 		target = user
 
-	bot.msg(replyto, "%(user)s: %(target)s has the following info items: %(items)s" % {'user':user,'target':target,'items':(', '.join(_keys(target)))})
+	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, 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")
@@ -112,7 +112,7 @@ def getinfo(bot, user, chan, realtarget, *args):
 		target = user
 		item = args[0]
 
-	value = _get(target, item, None)
+	value = get(target, item, None)
 	if value is None:
 		bot.msg(replyto, "%(user)s: %(item)s on %(target)s is not set." % {'user':user,'item':item,'target':target})
 	else:
@@ -122,7 +122,7 @@ def getinfo(bot, user, chan, realtarget, *args):
 @lib.help("<item> <value>", "sets an info item about you")
 @lib.argsGE(2)
 def setinfo(bot, user, chan, realtarget, *args):
-	_set(user, args[0], ' '.join(args[1:]))
+	set(user, args[0], ' '.join(args[1:]))
 	savedb()
 	bot.msg(user, "Done.")
 
@@ -130,7 +130,7 @@ def setinfo(bot, user, chan, realtarget, *args):
 @lib.help("<item>", "deletes an info item about you")
 @lib.argsEQ(1)
 def delinfo(bot, user, chan, realtarget, *args):
-	_del(user, args[0])
+	delete(user, args[0])
 	savedb()
 	bot.msg(user, "Done.")
 
@@ -138,7 +138,7 @@ def delinfo(bot, user, chan, realtarget, *args):
 @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:]))
+	set(args[0], args[1], ' '.join(args[2:]))
 	savedb()
 	bot.msg(user, "Done.")
 
@@ -146,6 +146,6 @@ def osetinfo(bot, user, chan, realtarget, *args):
 @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])
+	delete(args[0], args[1])
 	savedb()
 	bot.msg(user, "Done.")
diff --git a/modules/weather.py b/modules/weather.py
index 8194f5b..5f016c0 100644
--- a/modules/weather.py
+++ b/modules/weather.py
@@ -27,7 +27,7 @@ if sys.version_info.major < 3:
 else:
 	from urllib.request import urlopen
 
-def location(person, default=None): return lib.mod('userinfo')._get(person, 'location', default=None)
+def location(person, default=None): return lib.mod('userinfo').get(person, 'location', default=None)
 
 def _dayofweek(dayname):
 	return ['mon','tue','wed','thu','fri','sat','sun'].index(dayname.lower())