Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2025-07-04 20:25:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switch github stargazer to voting on DBLorg

Browse Source
This commit is contained in:
Jeremy Zhang
2018-02-18 22:50:24 +00:00
parent cd0f97d153
commit 39dc966138
8 changed files with 75 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
from titanembeds.utils import socketio, guild_accepts_visitors, get_client_ipaddr, discord_api, check_user_in_guild, get_guild_channels, update_user_status, guild_webhooks_enabled
from titanembeds.database import db, GuildMembers, get_guild_member, Guilds, get_badges
from titanembeds.utils import socketio, guild_accepts_visitors, get_client_ipaddr, discord_api, check_user_in_guild, get_guild_channels, update_user_status, guild_webhooks_enabled, redis_store
from titanembeds.database import db, GuildMembers, get_guild_member, Guilds
from flask_socketio import Namespace, emit, disconnect, join_room, leave_room
import functools
from flask import request, session
@ -158,7 +158,7 @@ class Gateway(Namespace):
"avatar": None,
"color": None,
"avatar_url": None,
"stargazer": False,
"discordbotsorgvoted": False,
}
member = db.session.query(GuildMembers).filter(GuildMembers.guild_id == guild_id, GuildMembers.username == name, GuildMembers.discriminator == discriminator).first()
if member:
@ -170,7 +170,7 @@ class Gateway(Namespace):
if (usr["avatar"]):
usr["avatar_url"] = "https://cdn.discordapp.com/avatars/{}/{}.png".format(usr["id"], usr["avatar"])
usr["roles"] = json.loads(member.roles)
usr["stargazer"] = "star" in get_badges(member.user_id)
usr["discordbotsorgvoted"] = bool(redis_store.get("DiscordBotsOrgVoted/" + str(member.user_id)))
else:
member = db.session.query(GuildMembers).filter(GuildMembers.guild_id == guild_id, GuildMembers.nickname == name, GuildMembers.discriminator == discriminator).first()
if member:
@ -182,6 +182,6 @@ class Gateway(Namespace):
if (usr["avatar"]):
usr["avatar_url"] = "https://cdn.discordapp.com/avatars/{}/{}.png".format(usr["id"], usr["avatar"])
usr["roles"] = json.loads(member.roles)
usr["stargazer"] = "star" in get_badges(member.user_id)
usr["discordbotsorgvoted"] = bool(redis_store.get("DiscordBotsOrgVoted/" + str(member.user_id)))
emit("lookup_user_info", usr)
self.teardown_db_session()