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

Implement user avatars into the embed

Browse Source
This commit is contained in:
Jeremy Zhang
2017-09-24 04:17:06 +00:00
parent ad833434dd
commit e30171a8de
7 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/titanembeds/blueprints/admin/admin.py
View File

@ -1,4 +1,5 @@
from flask import Blueprint, url_for, redirect, session, render_template, abort, request, jsonify
from flask_socketio import emit
from functools import wraps
from titanembeds.database import db, get_administrators_list, Cosmetics, Guilds, UnauthenticatedUsers, UnauthenticatedBans, TitanTokens, TokenTransactions, get_titan_token, set_titan_token
from titanembeds.oauth import generate_guild_icon_url
@ -179,6 +180,7 @@ def update_administrate_guild(guild_id):
guest_icon = None
db_guild.guest_icon = guest_icon
db.session.commit()
emit("guest_icon_change", {"guest_icon": guest_icon}, room="GUILD_"+guild_id, namespace="/gateway")
return jsonify(
id=db_guild.id,
guild_id=db_guild.guild_id,

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

@ -358,6 +358,10 @@ def change_unauthenticated_username():
response.status_code = 403
return response
def get_guild_guest_icon(guild_id):
return db.session.query(Guilds).filter(Guilds.guild_id == guild_id).first().guest_icon
def process_query_guild(guild_id, visitor=False):
widget = discord_api.get_widget(guild_id)
channels = get_guild_channels(guild_id, visitor)
@ -367,10 +371,11 @@ def process_query_guild(guild_id, visitor=False):
discordmembers = [{"id": 0, "color": "FFD6D6", "status": "dnd", "username": "Discord Server Widget is Currently Disabled"}]
embedmembers = get_online_embed_users(guild_id)
emojis = get_guild_emojis(guild_id)
guest_icon = get_guild_guest_icon(guild_id)
if visitor:
for channel in channels:
channel["write"] = False
return jsonify(channels=channels, discordmembers=discordmembers, embedmembers=embedmembers, emojis=emojis, instant_invite=widget.get("instant_invite", None))
return jsonify(channels=channels, discordmembers=discordmembers, embedmembers=embedmembers, emojis=emojis, guest_icon=guest_icon, instant_invite=widget.get("instant_invite", None))
@api.route("/query_guild", methods=["GET"])
@valid_session_required(api=True)

2
webapp/titanembeds/blueprints/user/user.py
View File

@ -1,5 +1,6 @@
from flask import Blueprint, request, redirect, jsonify, abort, session, url_for, render_template
from flask import current_app as app
from flask_socketio import emit
from config import config
from titanembeds.decorators import discord_users_only
from titanembeds.database import db, Guilds, UnauthenticatedUsers, UnauthenticatedBans, Cosmetics, UserCSS, set_titan_token, get_titan_token
@ -242,6 +243,7 @@ def update_administrate_guild(guild_id):
db_guild.guest_icon = guest_icon
db.session.commit()
emit("guest_icon_change", {"guest_icon": guest_icon}, room="GUILD_"+guild_id, namespace="/gateway")
return jsonify(
id=db_guild.id,
guild_id=db_guild.guild_id,