Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-17 06:00:42 +01:00
Code Issues Projects Releases Wiki Activity

Aka: Fix case-sensitivity.

Browse Source
This commit is contained in:
Valentin Lorentz 2013-08-17 07:02:10 +00:00
parent e120ab7eab
commit 921ff2ae07
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/Aka/plugin.py
View File

@ -102,6 +102,7 @@ if sqlalchemy:
def has_aka(self, channel, name): def has_aka(self, channel, name):
if sys.version_info[0] < 3 and isinstance(name, str): if sys.version_info[0] < 3 and isinstance(name, str):
name = name.decode('utf8') name = name.decode('utf8')
name = callbacks.canonicalName(name)
count = self.get_db(channel).query(Alias) \ count = self.get_db(channel).query(Alias) \
.filter(Alias.name == name) \ .filter(Alias.name == name) \
.count() .count()
@ -113,6 +114,7 @@ if sqlalchemy:
def get_alias(self, channel, name): def get_alias(self, channel, name):
if sys.version_info[0] < 3 and isinstance(name, str): if sys.version_info[0] < 3 and isinstance(name, str):
name = name.decode('utf8') name = name.decode('utf8')
name = callbacks.canonicalName(name)
try: try:
return self.get_db(channel).query(Alias.alias) \ return self.get_db(channel).query(Alias.alias) \
.filter(Alias.name == name).one()[0] .filter(Alias.name == name).one()[0]
@ -120,6 +122,7 @@ if sqlalchemy:
return None return None
def add_aka(self, channel, name, alias): def add_aka(self, channel, name, alias):
name = callbacks.canonicalName(name)
if self.has_aka(channel, name): if self.has_aka(channel, name):
raise AkaError(_('This Aka already exists.')) raise AkaError(_('This Aka already exists.'))
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
@ -134,6 +137,7 @@ if sqlalchemy:
def remove_aka(self, channel, name): def remove_aka(self, channel, name):
if sys.version_info[0] < 3 and isinstance(name, str): if sys.version_info[0] < 3 and isinstance(name, str):
name = name.decode('utf8') name = name.decode('utf8')
name = callbacks.canonicalName(name)
db = self.get_db(channel) db = self.get_db(channel)
db.query(Alias).filter(Alias.name == name).delete() db.query(Alias).filter(Alias.name == name).delete()
db.commit() db.commit()
@ -141,6 +145,7 @@ if sqlalchemy:
def lock_aka(self, channel, name, by): def lock_aka(self, channel, name, by):
if sys.version_info[0] < 3 and isinstance(name, str): if sys.version_info[0] < 3 and isinstance(name, str):
name = name.decode('utf8') name = name.decode('utf8')
name = callbacks.canonicalName(name)
db = self.get_db(channel) db = self.get_db(channel)
try: try:
aka = db.query(Alias) \ aka = db.query(Alias) \
@ -157,6 +162,7 @@ if sqlalchemy:
def unlock_aka(self, channel, name, by): def unlock_aka(self, channel, name, by):
if sys.version_info[0] < 3 and isinstance(name, str): if sys.version_info[0] < 3 and isinstance(name, str):
name = name.decode('utf8') name = name.decode('utf8')
name = callbacks.canonicalName(name)
db = self.get_db(channel) db = self.get_db(channel)
try: try:
aka = db.query(Alias) \ aka = db.query(Alias) \
@ -173,6 +179,7 @@ if sqlalchemy:
def get_aka_lock(self, channel, name): def get_aka_lock(self, channel, name):
if sys.version_info[0] < 3 and isinstance(name, str): if sys.version_info[0] < 3 and isinstance(name, str):
name = name.decode('utf8') name = name.decode('utf8')
name = callbacks.canonicalName(name)
try: try:
return self.get_db(channel) \ return self.get_db(channel) \
.query(Alias.locked, Alias.locked_by, Alias.locked_at)\ .query(Alias.locked, Alias.locked_by, Alias.locked_at)\