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

Guest Username Change better websocket support

Browse Source
This commit is contained in:
Jeremy Zhang 2017-08-25 07:45:59 +00:00
parent e3f57500ff
commit ac956106e9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ from titanembeds.utils import check_guild_existance, guild_accepts_visitors, gui
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 titanembeds.userbookkeeping import user_unauthenticated, checkUserRevoke, checkUserBanned, update_user_status, check_user_in_guild, get_guild_channels from titanembeds.userbookkeeping import user_unauthenticated, checkUserRevoke, checkUserBanned, update_user_status, check_user_in_guild, get_guild_channels
from flask import Blueprint, abort, jsonify, session, request, url_for from flask import Blueprint, abort, jsonify, session, request, url_for
from flask_socketio import emit
from sqlalchemy import and_ from sqlalchemy import and_
import random import random
import json import json
@ -107,7 +108,7 @@ def get_online_discord_users(guild_id, embed):
return embed['members'] return embed['members']
def get_online_embed_users(guild_id): def get_online_embed_users(guild_id):
time_past = (datetime.datetime.now() - datetime.timedelta(seconds = 60)).strftime('%Y-%m-%d %H:%M:%S') time_past = (datetime.datetime.now() - datetime.timedelta(seconds = 15)).strftime('%Y-%m-%d %H:%M:%S')
unauths = db.session.query(UnauthenticatedUsers).filter(UnauthenticatedUsers.last_timestamp > time_past, UnauthenticatedUsers.revoked == False, UnauthenticatedUsers.guild_id == guild_id).all() unauths = db.session.query(UnauthenticatedUsers).filter(UnauthenticatedUsers.last_timestamp > time_past, UnauthenticatedUsers.revoked == False, UnauthenticatedUsers.guild_id == guild_id).all()
auths = db.session.query(AuthenticatedUsers).filter(AuthenticatedUsers.last_timestamp > time_past, AuthenticatedUsers.guild_id == guild_id).all() auths = db.session.query(AuthenticatedUsers).filter(AuthenticatedUsers.last_timestamp > time_past, AuthenticatedUsers.guild_id == guild_id).all()
users = {'unauthenticated':[], 'authenticated':[]} users = {'unauthenticated':[], 'authenticated':[]}
@ -308,6 +309,7 @@ def change_unauthenticated_username():
if not checkUserBanned(guild_id, ip_address): if not checkUserBanned(guild_id, ip_address):
if 'user_keys' not in session or guild_id not in session['user_keys'] or not session['unauthenticated']: if 'user_keys' not in session or guild_id not in session['user_keys'] or not session['unauthenticated']:
abort(424) abort(424)
emitmsg = {"unauthenticated": True, "username": session["username"], "discriminator": session["user_id"]}
session['username'] = username session['username'] = username
if 'user_id' not in session or len(str(session["user_id"])) > 4: if 'user_id' not in session or len(str(session["user_id"])) > 4:
session['user_id'] = random.randint(0,9999) session['user_id'] = random.randint(0,9999)
@ -317,6 +319,7 @@ def change_unauthenticated_username():
key = user.user_key key = user.user_key
session['user_keys'][guild_id] = key session['user_keys'][guild_id] = key
status = update_user_status(guild_id, username, key) status = update_user_status(guild_id, username, key)
emit("embed_user_disconnect", emitmsg, room="GUILD_"+guild_id, namespace="/gateway")
return jsonify(status=status) return jsonify(status=status)
else: else:
status = {'banned': True} status = {'banned': True}

6
webapp/titanembeds/static/js/embed.js
View File

@ -877,7 +877,11 @@
var usr = change_unauthenticated_username($(this).val()); var usr = change_unauthenticated_username($(this).val());
usr.done(function(data) { usr.done(function(data) {
Materialize.toast('Username changed successfully!', 10000); Materialize.toast('Username changed successfully!', 10000);
run_fetch_routine(); if (socket) {
run_fetch_routine();
socket.disconnect();
initiate_websockets();
}
}); });
usr.fail(function(data) { usr.fail(function(data) {
if (data.status == 429) { if (data.status == 429) {