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

Remove discordio partnership and repurpose it to custom invite link field

Browse Source
This commit is contained in:
Jeremy Zhang
2018-01-13 18:37:42 +00:00
parent ef7ef65a44
commit 8028813e0f
11 changed files with 60 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,7 @@ def administrate_guild(guild_id):
"mentions_limit": db_guild.mentions_limit,
"unauth_captcha": db_guild.unauth_captcha,
"icon": db_guild.icon,
"discordio": db_guild.discordio if db_guild.discordio != None else "",
"invite_link": db_guild.invite_link if db_guild.invite_link != None else "",
"guest_icon": db_guild.guest_icon if db_guild.guest_icon != None else "",
}
return render_template("administrate_guild.html.j2", guild=dbguild_dict, members=users, permissions=permissions, cosmetics=cosmetics)
@ -194,10 +194,10 @@ def update_administrate_guild(guild_id):
db_guild.bracket_links = request.form.get("bracket_links", db_guild.bracket_links) in ["true", True]
db_guild.mentions_limit = request.form.get("mentions_limit", db_guild.mentions_limit)
db_guild.unauth_captcha = request.form.get("unauth_captcha", db_guild.unauth_captcha) in ["true", True]
discordio = request.form.get("discordio", db_guild.discordio)
if discordio != None and discordio.strip() == "":
discordio = None
db_guild.discordio = discordio
invite_link = request.form.get("invite_link", db_guild.invite_link)
if invite_link != None and invite_link.strip() == "":
invite_link = None
db_guild.invite_link = invite_link
guest_icon = request.form.get("guest_icon", db_guild.guest_icon)
if guest_icon != None and guest_icon.strip() == "":
guest_icon = None
@ -213,7 +213,7 @@ def update_administrate_guild(guild_id):
chat_links=db_guild.chat_links,
bracket_links=db_guild.bracket_links,
mentions_limit=db_guild.mentions_limit,
discordio=db_guild.discordio,
invite_link=db_guild.invite_link,
guest_icon=db_guild.guest_icon,
unauth_captcha=db_guild.unauth_captcha,
)

10
webapp/titanembeds/blueprints/embed/embed.py
View File

@ -6,6 +6,7 @@ from titanembeds.database import db, Guilds, UserCSS, list_disabled_guilds
from config import config
import random
import json
from urllib.parse import urlparse
embed = Blueprint("embed", __name__)
@ -52,6 +53,12 @@ def parse_css_variable(css):
return CSS_VARIABLES_TEMPLATE % variables
return None
def parse_url_domain(url):
parsed = urlparse(url)
if parsed.netloc != "":
return parsed.netloc
return url
@embed.route("/<string:guild_id>")
def guild_embed(guild_id):
if check_guild_existance(guild_id):
@ -61,7 +68,8 @@ def guild_embed(guild_id):
"name": guild.name,
"unauth_users": guild.unauth_users,
"icon": guild.icon,
"discordio": guild.discordio,
"invite_link": guild.invite_link,
"invite_domain": parse_url_domain(guild.invite_link),
}
customcss = get_custom_css()
return render_template("embed.html.j2",

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

@ -215,7 +215,7 @@ def administrate_guild(guild_id):
"mentions_limit": db_guild.mentions_limit,
"unauth_captcha": db_guild.unauth_captcha,
"icon": db_guild.icon,
"discordio": db_guild.discordio if db_guild.discordio != None else "",
"invite_link": db_guild.invite_link if db_guild.invite_link != None else "",
"guest_icon": db_guild.guest_icon if db_guild.guest_icon != None else "",
}
return render_template("administrate_guild.html.j2", guild=dbguild_dict, members=users, permissions=permissions, cosmetics=cosmetics, disabled=(guild_id in list_disabled_guilds()))
@ -240,10 +240,10 @@ def update_administrate_guild(guild_id):
db_guild.mentions_limit = request.form.get("mentions_limit", db_guild.mentions_limit)
db_guild.unauth_captcha = request.form.get("unauth_captcha", db_guild.unauth_captcha) in ["true", True]
discordio = request.form.get("discordio", db_guild.discordio)
if discordio != None and discordio.strip() == "":
discordio = None
db_guild.discordio = discordio
invite_link = request.form.get("invite_link", db_guild.invite_link)
if invite_link != None and invite_link.strip() == "":
invite_link = None
db_guild.invite_link = invite_link
guest_icon = request.form.get("guest_icon", db_guild.guest_icon)
if guest_icon != None and guest_icon.strip() == "":
@ -261,7 +261,7 @@ def update_administrate_guild(guild_id):
chat_links=db_guild.chat_links,
bracket_links=db_guild.bracket_links,
mentions_limit=db_guild.mentions_limit,
discordio=db_guild.discordio,
invite_link=db_guild.invite_link,
guest_icon=guest_icon,
unauth_captcha=db_guild.unauth_captcha,
)