diff --git a/titanembeds/blueprints/api/api.py b/titanembeds/blueprints/api/api.py index c8dea53..8f1d7c2 100644 --- a/titanembeds/blueprints/api/api.py +++ b/titanembeds/blueprints/api/api.py @@ -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() diff --git a/titanembeds/static/js/embed.js b/titanembeds/static/js/embed.js index b707bb4..e13e43f 100644 --- a/titanembeds/static/js/embed.js +++ b/titanembeds/static/js/embed.js @@ -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 } -); \ No newline at end of file +);