apps/rophako
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Protocol agnostic URL for emoticons

Browse Source
This commit is contained in:
Noah 2015-06-19 21:52:06 +00:00
parent 09a604b555
commit a994d37a9e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rophako/model/emoticons.py
View File

@ -70,8 +70,11 @@ def render(message):
for trigger in smileys["map"][img]: for trigger in smileys["map"][img]:
if trigger in message: if trigger in message:
# Substitute it. # Substitute it.
url = request.url_root.strip("/") \
.replace("http:", "") \
.replace("https:", "")
sub = """<img src="{url}" class="rophako-emoticon" alt="{trigger}" title="{trigger}">""".format( sub = """<img src="{url}" class="rophako-emoticon" alt="{trigger}" title="{trigger}">""".format(
url="{}/static/smileys/{}/{}".format(request.url_root.strip("/"), Config.emoticons.theme, img), url="{}/static/smileys/{}/{}".format(url, Config.emoticons.theme, img),
trigger=trigger, trigger=trigger,
) )
pattern = r'([^A-Za-z0-9:\-]|^){}([^A-Za-z0-9:\-]|$)'.format(re.escape(trigger)) pattern = r'([^A-Za-z0-9:\-]|^){}([^A-Za-z0-9:\-]|$)'.format(re.escape(trigger))