mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-07 19:49:23 +01:00
Made it so admins can unlock anyone's factoids.
This commit is contained in:
parent
68dd30cb8b
commit
aa05fc1a79
@ -228,15 +228,14 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
|
|||||||
def _getDunno(self, nick):
|
def _getDunno(self, nick):
|
||||||
"""Retrieves a "dunno" from the database."""
|
"""Retrieves a "dunno" from the database."""
|
||||||
cursor = self.db.cursor()
|
cursor = self.db.cursor()
|
||||||
cursor.execute("""SELECT id, dunno
|
cursor.execute("""SELECT dunno
|
||||||
FROM dunnos
|
FROM dunnos
|
||||||
ORDER BY random()
|
ORDER BY random()
|
||||||
LIMIT 1""")
|
LIMIT 1""")
|
||||||
if cursor.rowcount == 0:
|
if cursor.rowcount == 0:
|
||||||
return "No dunno's available, add some with dunnoadd."
|
return "No dunno's available, add some with dunnoadd."
|
||||||
(id, dunno) = cursor.fetchone()
|
dunno = cursor.fetchone()[0]
|
||||||
dunno = dunno.replace('$who', nick)
|
dunno = dunno.replace('$who', nick)
|
||||||
dunno += " (#%d)" % id
|
|
||||||
return dunno
|
return dunno
|
||||||
|
|
||||||
def addFactoid(self, irc, msg, match):
|
def addFactoid(self, irc, msg, match):
|
||||||
@ -448,11 +447,12 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
|
|||||||
irc.error(msg, "Factoid '%s' is not locked." % key)
|
irc.error(msg, "Factoid '%s' is not locked." % key)
|
||||||
return
|
return
|
||||||
# Can only lock/unlock own factoids
|
# Can only lock/unlock own factoids
|
||||||
if created_by != id:
|
if not (ircdb.checkCapability(id, 'admin') or created_by == id):
|
||||||
s = "unlock"
|
s = "unlock"
|
||||||
if lock:
|
if lock:
|
||||||
s = "lock"
|
s = "lock"
|
||||||
irc.error(msg, "Cannot %s someone else's factoid." % s)
|
irc.error(msg, "Cannot %s someone else's factoid unless you "
|
||||||
|
"are an admin." % s)
|
||||||
return
|
return
|
||||||
# Okay, we're done, ready to lock/unlock
|
# Okay, we're done, ready to lock/unlock
|
||||||
if lock:
|
if lock:
|
||||||
|
Loading…
Reference in New Issue
Block a user