Merge pull request #45 from olymk2/emojii-storage-fix

emoji static storage fixes #44

Author: agusmakmun

martor/extensions/emoji.py

@@ -1,5 +1,8 @@
 import markdown
-from ..settings import MARTOR_MARKDOWN_BASE_EMOJI_URL
+from ..settings import (
+    MARTOR_MARKDOWN_BASE_EMOJI_URL,
+    MARTOR_MARKDOWN_BASE_EMOJI_USE_STATIC)
+from django.contrib.staticfiles.templatetags.staticfiles import static
 
 """
 >>> import markdown
@@ -98,6 +101,8 @@ def handleMatch(self, m):
         url = '{0}{1}.png'.format(
             MARTOR_MARKDOWN_BASE_EMOJI_URL, emoji.replace(':', '')
         )
+        if MARTOR_MARKDOWN_BASE_EMOJI_USE_STATIC is True:
+            url = static(url)
         el = markdown.util.etree.Element('img')
         el.set('src', url)
         el.set('class', 'marked-emoji')
@@ -115,6 +120,7 @@ def extendMarkdown(self, md, md_globals):
 def makeExtension(*args, **kwargs):
     return EmojiExtension(*args, **kwargs)
 
+
 if __name__ == "__main__":
     import doctest
     doctest.testmod()

martor/settings.py

@@ -71,6 +71,10 @@
 MARTOR_MARKDOWN_BASE_EMOJI_URL = getattr(
     settings, 'MARTOR_MARKDOWN_BASE_EMOJI_URL', 'https://assets-cdn.github.com/images/icons/emoji/'
 )
+# to use static and keep backward compatibility
+# set to true if using bucket like storage engine
+MARTOR_MARKDOWN_BASE_EMOJI_USE_STATIC = getattr(
+    settings, 'MARTOR_MARKDOWN_BASE_EMOJI_USE_STATIC', False)
 MARTOR_MARKDOWN_BASE_MENTION_URL = getattr(
     settings, 'MARTOR_MARKDOWN_BASE_MENTION_URL', 'https://python.web.id/author/'
 )