velvox
/
litecord
mirror of https://gitlab.com/litecord/litecord.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix icons and message history breaking

This commit is contained in:
gabixdev 2019-03-02 00:38:37 +01:00
parent a7dc9e01dc
commit e5cff415f5
No known key found for this signature in database
GPG Key ID: 3E00485503A1D8BA
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
litecord/blueprints/icons.py
View File

@ -27,7 +27,6 @@ async def send_icon(scope, key, icon_hash, **kwargs):
"""Send an icon.""" """Send an icon."""
icon = await app.icons.generic_get( icon = await app.icons.generic_get(
scope, key, icon_hash, **kwargs) scope, key, icon_hash, **kwargs)
if not icon: if not icon:
return '', 404 return '', 404

2
litecord/images.py
View File

@ -274,8 +274,6 @@ class IconManager:
async def generic_get(self, scope, key, icon_hash, **kwargs) -> Icon: async def generic_get(self, scope, key, icon_hash, **kwargs) -> Icon:
"""Get any icon.""" """Get any icon."""
if icon_hash is None:
return None
log.debug('GET {} {} {}', scope, key, icon_hash) log.debug('GET {} {} {}', scope, key, icon_hash)
key = str(key) key = str(key)

7
litecord/storage.py
View File

@ -604,8 +604,10 @@ class Storage:
return [r[0] for r in rows] return [r[0] for r in rows]
async def _msg_regex(self, regex, func, content) -> List[Dict]: async def _msg_regex(self, regex, func, content) -> List[Dict]:
res = [] if content is None:
return []
res = []
for match in regex.finditer(content): for match in regex.finditer(content):
found_id = match.group(1) found_id = match.group(1)
@ -763,6 +765,9 @@ class Storage:
res['type'] = res['message_type'] res['type'] = res['message_type']
res.pop('message_type') res.pop('message_type')
if res['content'] is None:
res['content'] = ""
channel_id = int(row['channel_id']) channel_id = int(row['channel_id'])
content = row['content'] content = row['content']
guild_id = await self.guild_from_channel(channel_id) guild_id = await self.guild_from_channel(channel_id)