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

Fix kick bug

Browse Source
This commit is contained in:
Jeremy Zhang
2017-04-05 20:18:07 -07:00
parent 347f001993
commit 8a382e8dae
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
titanembeds/blueprints/api/api.py
View File

@@ -65,6 +65,7 @@ def update_user_status(guild_id, username, user_key=None):
'revoked': checkUserRevoke(guild_id, user_key),
}
if status['banned'] or status['revoked']:
session['user_keys'].pop(guild_id, None)
return status
dbUser = UnauthenticatedUsers.query.filter(and_(UnauthenticatedUsers.guild_id == guild_id, UnauthenticatedUsers.user_key == user_key)).first()
dbUser.bumpTimestamp()

18
titanembeds/static/js/embed.js
View File

@@ -78,7 +78,7 @@ function post(channel_id, content) {
return funct.promise();
}
$(function(){
$(function(){
resize_messagebox();
$("#loginmodal").modal({
dismissible: false, // Modal can be dismissed by clicking outside of the modal
@@ -89,12 +89,12 @@ $(function(){
endingTop: '10%', // Ending top style attribute
}
);
var guild = query_guild();
guild.fail(function() {
$('#loginmodal').modal('open');
});
guild.done(function(data) {
initialize_embed(data);
//$('#loginmodal').modal('open');
@@ -299,14 +299,16 @@ function run_fetch_routine() {
fet.fail(function(data) {
if (data.status == 403) {
$('#loginmodal').modal('open');
Materialize.toast('Authentication error! You have been banned.', 10000);
Materialize.toast('Authentication error! You have been disconnected by the server.', 10000);
} else if (data.status == 401) {
$('#loginmodal').modal('open');
Materialize.toast('Session expired! You have been logged out.', 10000);
}
});
fet.catch(function(data) {
fetchtimeout = setTimeout(run_fetch_routine, 10000);
if (data.status != 403) {
fetchtimeout = setTimeout(run_fetch_routine, 10000);
}
});
}
@@ -335,7 +337,9 @@ $("#custom_username_field").keyup(function(event){
initialize_embed();
});
usr.fail(function(data) {
if (data.status == 403) {
if (data.status == 429) {
Materialize.toast('Sorry! You are allowed to log in as a guest once every 15 minutes.', 10000);
} else if (data.status == 403) {
Materialize.toast('Authentication error! You have been banned.', 10000);
}
})
@@ -383,4 +387,4 @@ $('#members-btn').sideNav({
edge: 'right', // Choose the horizontal origin
draggable: true // Choose whether you can drag to open on touch screens
}
);
);