Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2025-06-16 19:35:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Chat username discord colors!

Browse Source
This commit is contained in:
Jeremy Zhang
2017-09-15 06:25:03 +00:00
parent 286f395b72
commit 80d89b49f8
3 changed files with 122 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,9 +241,8 @@ def post():
userid = session["user_id"]
content = format_everyone_mention(chan, content)
webhook = get_channel_webhook_url(guild_id, channel_id)
if userid in get_administrators_list():
oldcontent = content
content = "(Titan Dev) " + oldcontent
# if userid in get_administrators_list():
# content = "(Titan Dev) " + content
if webhook:
if (session['unauthenticated']):
username = session["username"] + "#" + str(session["user_id"])
@ -258,11 +257,10 @@ def post():
if dbUser:
if dbUser.nickname:
username = dbUser.nickname
if content.startswith("(Titan Dev) "):
content = content[12:]
username = "(Titan Dev) " + username
else:
username = username + "#" + str(session['discriminator'])
# if content.startswith("(Titan Dev) "):
# content = content[12:]
# username = "(Titan Dev) " + username
username = username + "#" + str(session['discriminator'])
avatar = session['avatar']
message = discord_api.execute_webhook(webhook.get("id"), webhook.get("token"), username, avatar, content)
else:

61
webapp/titanembeds/blueprints/gateway/gateway.py
View File

@ -105,4 +105,63 @@ class Gateway(Namespace):
'discriminator': dbMember.discriminator,
'user_id': session['user_id'],
}
emit("current_user_info", usr)
emit("current_user_info", usr)
def get_user_color(self, guild_id, user_id):
color = None
member = db.session.query(GuildMembers).filter(GuildMembers.guild_id == guild_id, GuildMembers.user_id == user_id).first()
if not member:
return None
guild_roles = json.loads(db.session.query(Guilds).filter(Guilds.guild_id == guild_id).first().roles)
guildroles_filtered = {}
for role in guild_roles:
guildroles_filtered[role["id"]] = role
member_roleids = json.loads(member.roles)
member_roles = []
for roleid in member_roleids:
role = guildroles_filtered.get(roleid)
if not role:
continue
member_roles.append(role)
member_roles = sorted(member_roles, key=lambda k: k['position'])
for role in member_roles:
if role["color"] != 0:
color = '{0:02x}'.format(role["color"])
while len(color) < 6:
color = "0" + color
return color
def on_lookup_user_info(self, data):
guild_id = data["guild_id"]
name = data["name"]
discriminator = data["discriminator"]
usr = {
"name": name,
"id": None,
"username": None,
"nickname": None,
"discriminator": discriminator,
"avatar": None,
"color": None,
"avatar_url": None,
}
member = db.session.query(GuildMembers).filter(GuildMembers.guild_id == guild_id, GuildMembers.username == name, GuildMembers.discriminator == discriminator).first()
if member:
usr["id"] = member.user_id
usr["username"] = member.username
usr["nickname"] = member.nickname
usr["avatar"] = member.avatar
usr["color"] = self.get_user_color(guild_id, usr["id"])
if (usr["avatar"]):
usr["avatar_url"] = "https://cdn.discordapp.com/avatars/{}/{}.jpg".format(usr["id"], usr["avatar"])
else:
member = db.session.query(GuildMembers).filter(GuildMembers.guild_id == guild_id, GuildMembers.nickname == name, GuildMembers.discriminator == discriminator).first()
if member:
usr["id"] = member.user_id
usr["username"] = member.username
usr["nickname"] = member.nickname
usr["avatar"] = member.avatar
usr["color"] = self.get_user_color(guild_id, usr["id"])
if (usr["avatar"]):
usr["avatar_url"] = "https://cdn.discordapp.com/avatars/{}/{}.jpg".format(usr["id"], usr["avatar"])
emit("lookup_user_info", usr)