Merge branch 'hotfix-icons-history' into 'master'

fix embeds, emotes, history and other stuff

See merge request litecord/litecord!22

litecord/blueprints/channel/messages.py

@@ -407,6 +407,9 @@ async def _create_message(channel_id):
         await _dm_pre_dispatch(channel_id, user_id)
         await _dm_pre_dispatch(channel_id, guild_id)
 
+    if payload['webhook_id'] == None:
+        payload.pop('webhook_id', None)
+
     await app.dispatcher.dispatch('channel', channel_id,
                                   'MESSAGE_CREATE', payload)
 

litecord/blueprints/icons.py

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

litecord/embed/schemas.py

@@ -46,7 +46,7 @@ class EmbedURL:
 
 EMBED_FOOTER = {
     'text': {
-        'type': 'string', 'minlength': 1, 'maxlength': 128, 'required': True},
+        'type': 'string', 'minlength': 1, 'maxlength': 1024, 'required': True},
 
     'icon_url': {
         'coerce': EmbedURL, 'required': False,
@@ -65,7 +65,7 @@ EMBED_THUMBNAIL = EMBED_IMAGE
 
 EMBED_AUTHOR = {
     'name': {
-        'type': 'string', 'minlength': 1, 'maxlength': 128, 'required': False
+        'type': 'string', 'minlength': 1, 'maxlength': 256, 'required': False
     },
     'url': {
         'coerce': EmbedURL, 'required': False,
@@ -79,10 +79,10 @@ EMBED_AUTHOR = {
 
 EMBED_FIELD = {
     'name': {
-        'type': 'string', 'minlength': 1, 'maxlength': 128, 'required': True
+        'type': 'string', 'minlength': 1, 'maxlength': 256, 'required': True
     },
     'value': {
-        'type': 'string', 'minlength': 1, 'maxlength': 128, 'required': True
+        'type': 'string', 'minlength': 1, 'maxlength': 1024, 'required': True
     },
     'inline': {
         'type': 'boolean', 'required': False, 'default': True,
@@ -91,10 +91,10 @@ EMBED_FIELD = {
 
 EMBED_OBJECT = {
     'title': {
-        'type': 'string', 'minlength': 1, 'maxlength': 128, 'required': False},
+        'type': 'string', 'minlength': 1, 'maxlength': 256, 'required': False},
     # NOTE: type set by us
     'description': {
-        'type': 'string', 'minlength': 1, 'maxlength': 1024, 'required': False,
+        'type': 'string', 'minlength': 1, 'maxlength': 2048, 'required': False,
     },
     'url': {
         'coerce': EmbedURL, 'required': False,

litecord/images.py

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

litecord/storage.py

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

litecord/types.py

@@ -37,6 +37,10 @@ class Color:
         """Give the actual RGB integer encoding this color."""
         return int('%02x%02x%02x' % (self.red, self.green, self.blue), 16)
 
+    @property
+    def to_json(self):
+        return self.value
+
     def __int__(self):
         return self.value