Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2024-11-15 02:21:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move parse emoji defintion to api

Browse Source
This commit is contained in:
Jeremy Zhang 2017-05-29 21:35:51 +00:00
parent 25da43263e
commit edfcb63706
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
webapp/titanembeds/EmojiParser.py
View File

@ -1,19 +0,0 @@
from titanembeds.utils import discord_api
import re
def parseEmoji(textToParse, guild_id):
_endpoint = "/guilds/{guild_id}".format(guild_id=guild_id)
_method = "GET"
response = discord_api.request(_method, _endpoint)
if not response.get("success", False):
return textToParse
emojis = []
emojis = re.findall("<:(.*?):(.*)?>", textToParse)
newText = textToParse
for emoji in response['content']['emojis']:
name = emoji['name']
emojiId = emoji['id']
for emoji2 in emojis:
if name.lower() == emoji2[0].lower():
newText = newText.replace("<:{}:{}>".format(name, emojiId), "<img src='https://cdn.discordapp.com/emojis/{}.png'></img>".format(emojiId))
return newText

21
webapp/titanembeds/blueprints/api/api.py
View File

@ -1,6 +1,5 @@
from titanembeds.database import db, Guilds, UnauthenticatedUsers, UnauthenticatedBans, AuthenticatedUsers, KeyValueProperties, GuildMembers, Messages, get_channel_messages, list_all_guild_members from titanembeds.database import db, Guilds, UnauthenticatedUsers, UnauthenticatedBans, AuthenticatedUsers, KeyValueProperties, GuildMembers, Messages, get_channel_messages, list_all_guild_members
from titanembeds.decorators import valid_session_required, discord_users_only from titanembeds.decorators import valid_session_required, discord_users_only
from titanembeds.EmojiParser import parseEmoji
from titanembeds.utils import check_guild_existance, guild_query_unauth_users_bool, get_client_ipaddr, discord_api, rate_limiter, channel_ratelimit_key, guild_ratelimit_key from titanembeds.utils import check_guild_existance, guild_query_unauth_users_bool, get_client_ipaddr, discord_api, rate_limiter, channel_ratelimit_key, guild_ratelimit_key
from titanembeds.oauth import user_has_permission, generate_avatar_url, check_user_can_administrate_guild from titanembeds.oauth import user_has_permission, generate_avatar_url, check_user_can_administrate_guild
from flask import Blueprint, abort, jsonify, session, request from flask import Blueprint, abort, jsonify, session, request
@ -100,10 +99,28 @@ def check_user_in_guild(guild_id):
dbUser = db.session.query(AuthenticatedUsers).filter(and_(AuthenticatedUsers.guild_id == guild_id, AuthenticatedUsers.client_id == session['user_id'])).first() dbUser = db.session.query(AuthenticatedUsers).filter(and_(AuthenticatedUsers.guild_id == guild_id, AuthenticatedUsers.client_id == session['user_id'])).first()
return dbUser is not None and not checkUserRevoke(guild_id) return dbUser is not None and not checkUserRevoke(guild_id)
def parse_emoji(textToParse, guild_id):
_endpoint = "/guilds/{guild_id}".format(guild_id=guild_id)
_method = "GET"
response = discord_api.request(_method, _endpoint)
if not response.get("success", False):
return textToParse
emojis = []
emojis = re.findall("<:(.*?):(.*)?>", textToParse)
newText = textToParse
for emoji in response['content']['emojis']:
name = emoji['name']
emojiId = emoji['id']
for emoji2 in emojis:
if name.lower() == emoji2[0].lower():
newText = newText.replace("<:{}:{}>".format(name, emojiId), "<img src='https://cdn.discordapp.com/emojis/{}.png'></img>".format(emojiId))
return newText
def format_post_content(guild_id, message): def format_post_content(guild_id, message):
illegal_post = False illegal_post = False
illegal_reasons = [] illegal_reasons = []
message = parseEmoji(message, guild_id) message = parse_emoji(message, guild_id)
message = message.replace("<", "\<") message = message.replace("<", "\<")
message = message.replace(">", "\>") message = message.replace(">", "\>")