Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2024-11-14 18:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bot needs create instant invite perms and more descriptive error for 422 if it happens

Browse Source
This commit is contained in:
Jeremy Zhang 2017-09-21 21:47:00 +00:00
parent a2461a9826
commit 956e466db1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/titanembeds/oauth.py
View File

@ -96,5 +96,5 @@ def generate_guild_icon_url(id, hash):
return guild_icon_url + str(id) + "/" + str(hash) + ".jpg" return guild_icon_url + str(id) + "/" + str(hash) + ".jpg"
def generate_bot_invite_url(guild_id): def generate_bot_invite_url(guild_id):
url = "https://discordapp.com/oauth2/authorize?&client_id={}&scope=bot&permissions={}&guild_id={}".format(config['client-id'], '537349164', guild_id) url = "https://discordapp.com/oauth2/authorize?&client_id={}&scope=bot&permissions={}&guild_id={}".format(config['client-id'], '641195117', guild_id)
return url return url

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

@ -616,6 +616,12 @@
if (data.status == 403) { if (data.status == 403) {
Materialize.toast('Authentication error! You have been banned.', 10000); Materialize.toast('Authentication error! You have been banned.', 10000);
setVisitorMode(true); setVisitorMode(true);
} else if (data.status == 422) {
if (data.responseJSON.code == 403) {
Materialize.toast("Attempting to add you into the server store has failed. The bot does not have permissions to create instant invite. Therefore, Discord Login has been disabled.", 10000);
} else {
Materialize.toast("Attempting to add you into the server has failed. Either you are banned, reached 100 servers in Discord, or something else bad has happened.", 10000);
}
} else if (index < 10) { } else if (index < 10) {
_wait_for_discord_login(index + 1); _wait_for_discord_login(index + 1);
} }
@ -986,8 +992,6 @@
Materialize.toast('Authentication error! You have been banned.', 10000); Materialize.toast('Authentication error! You have been banned.', 10000);
} else if (data.status == 406) { } else if (data.status == 406) {
Materialize.toast('Illegal username provided! Only alphanumeric, spaces, dashes, and underscores allowed in usernames.', 10000); Materialize.toast('Illegal username provided! Only alphanumeric, spaces, dashes, and underscores allowed in usernames.', 10000);
} else if (data.status == 422) {
Materialize.toast("Attempting to add you into the server has failed. Either you are banned, reached 100 servers in Discord, or something else bad has happened.", 10000);
} else if (data.status == 412) { } else if (data.status == 412) {
Materialize.toast("reCAPTCHA reponse has failed. Try again?", 10000); Materialize.toast("reCAPTCHA reponse has failed. Try again?", 10000);
} }