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

Commit to database on only on request teardown

Browse Source
This commit is contained in:
Jeremy Zhang
2018-01-22 07:52:51 +00:00
parent 2c949d911b
commit 56d25d6ecb
10 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
webapp/titanembeds/app.py
View File

@@ -28,6 +28,7 @@ app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False # Suppress the warning/no
app.config['RATELIMIT_HEADERS_ENABLED'] = True
app.config['SQLALCHEMY_POOL_RECYCLE'] = 250
app.config['SQLALCHEMY_POOL_SIZE'] = 100
app.config['SQLALCHEMY_COMMIT_ON_TEARDOWN'] = True
app.config['RATELIMIT_STORAGE_URL'] = config["redis-uri"]
app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(days=3)
app.config['REDIS_URL'] = config["redis-uri"]

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

@@ -67,7 +67,6 @@ def cosmetics_post():
badges = []
user.badges = json.dumps(badges)
db.session.add(user)
db.session.commit()
return ('', 204)
@admin.route("/cosmetics", methods=["DELETE"])
@@ -80,7 +79,6 @@ def cosmetics_delete():
if not entry:
abort(409)
db.session.delete(entry)
db.session.commit()
return ('', 204)
@admin.route("/cosmetics", methods=["PATCH"])
@@ -109,7 +107,6 @@ def cosmetics_patch():
if badges == [""]:
badges = []
entry.badges = json.dumps(badges)
db.session.commit()
return ('', 204)
def prepare_guild_members_list(members, bans):
@@ -202,7 +199,6 @@ def update_administrate_guild(guild_id):
if guest_icon != None and guest_icon.strip() == "":
guest_icon = None
db_guild.guest_icon = guest_icon
db.session.commit()
emit("guest_icon_change", {"guest_icon": guest_icon if guest_icon else url_for('static', filename='img/titanembeds_square.png')}, room="GUILD_"+guild_id, namespace="/gateway")
return jsonify(
id=db_guild.id,
@@ -288,7 +284,6 @@ def post_disabled_guilds():
abort(409)
guild = DisabledGuilds(guild_id)
db.session.add(guild)
db.session.commit()
return ('', 204)
@admin.route("/disabled_guilds", methods=["DELETE"])
@@ -299,7 +294,6 @@ def delete_disabled_guilds():
abort(409)
guild = db.session.query(DisabledGuilds).filter(DisabledGuilds.guild_id == guild_id).first()
db.session.delete(guild)
db.session.commit()
return ('', 204)
@admin.route("/custom_css", methods=["GET"])
@@ -344,7 +338,6 @@ def edit_custom_css_post(css_id):
dbcss.css = css
dbcss.css_variables = variables
dbcss.css_var_bool = variables_enabled
db.session.commit()
return jsonify({"id": dbcss.id})
@admin.route("/custom_css/edit/<css_id>", methods=["DELETE"])
@@ -354,7 +347,6 @@ def edit_custom_css_delete(css_id):
if not dbcss:
abort(404)
db.session.delete(dbcss)
db.session.commit()
return jsonify({})
@admin.route("/custom_css/new", methods=["GET"])
@@ -381,5 +373,4 @@ def new_custom_css_post():
css = None
css = UserCSS(name, user_id, variables_enabled, variables, css)
db.session.add(css)
db.session.commit()
return jsonify({"id": css.id})

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

@@ -313,7 +313,6 @@ def create_unauthenticated_user():
session['user_id'] = random.randint(0,9999)
user = UnauthenticatedUsers(guild_id, username, session['user_id'], ip_address)
db.session.add(user)
db.session.commit()
key = user.user_key
if 'user_keys' not in session:
session['user_keys'] = {guild_id: key}
@@ -353,7 +352,6 @@ def change_unauthenticated_username():
session['user_id'] = random.randint(0,9999)
user = UnauthenticatedUsers(guild_id, username, session['user_id'], ip_address)
db.session.add(user)
db.session.commit()
key = user.user_key
session['user_keys'][guild_id] = key
status = update_user_status(guild_id, username, key)
@@ -428,7 +426,6 @@ def create_authenticated_user():
if not db_user:
db_user = AuthenticatedUsers(guild_id, session['user_id'])
db.session.add(db_user)
db.session.commit()
status = update_user_status(guild_id, session['username'])
return jsonify(status=status)
else:

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

@@ -119,7 +119,6 @@ def new_custom_css_post():
css = None
css = UserCSS(name, user_id, variables_enabled, variables, css)
db.session.add(css)
db.session.commit()
return jsonify({"id": css.id})
@user.route("/custom_css/edit/<css_id>", methods=["GET"])
@@ -165,7 +164,6 @@ def edit_custom_css_post(css_id):
dbcss.css = css
dbcss.css_variables = variables
dbcss.css_var_bool = variables_enabled
db.session.commit()
return jsonify({"id": dbcss.id})
@user.route("/custom_css/edit/<css_id>", methods=["DELETE"])
@@ -180,7 +178,6 @@ def edit_custom_css_delete(css_id):
if dbcss.user_id != session['user_id']:
abort(403)
db.session.delete(dbcss)
db.session.commit()
return jsonify({})
@user.route("/administrate_guild/<guild_id>", methods=["GET"])
@@ -250,7 +247,6 @@ def update_administrate_guild(guild_id):
guest_icon = None
db_guild.guest_icon = guest_icon
db.session.commit()
emit("guest_icon_change", {"guest_icon": guest_icon if guest_icon else url_for('static', filename='img/titanembeds_square.png')}, room="GUILD_"+guild_id, namespace="/gateway")
return jsonify(
id=db_guild.id,
@@ -337,7 +333,6 @@ def ban_unauthenticated_user():
db.session.delete(db_ban)
db_ban = UnauthenticatedBans(guild_id, db_user.ip_address, db_user.username, db_user.discriminator, reason, session["user_id"])
db.session.add(db_ban)
db.session.commit()
return ('', 204)
@user.route("/ban", methods=["DELETE"])
@@ -481,7 +476,6 @@ def donate_patch():
entry = Cosmetics(session["user_id"])
entry.guest_icon = True
db.session.add(entry)
db.session.commit()
return ('', 204)
@user.route("/patreon")
@@ -561,7 +555,6 @@ def patreon_sync_post():
dbpatreon = Patreon(usr["id"])
dbpatreon.total_synced = usr["titan"]["total_cents_pledged"]
db.session.add(dbpatreon)
db.session.commit()
set_titan_token(session["user_id"], usr["titan"]["eligible_tokens"], "PATREON {} [{}]".format(usr["attributes"]["full_name"], usr["id"]))
add_badge(session["user_id"], "supporter")
session["tokens"] = get_titan_token(session["user_id"])

1
webapp/titanembeds/database/__init__.py
View File

@@ -30,5 +30,4 @@ def set_titan_token(user_id, amt_change, action):
db.session.add(transact)
token_usr.tokens = new_token_count
db.session.add(token_usr)
db.session.commit()
return True

1
webapp/titanembeds/database/cosmetics.py
View File

@@ -39,7 +39,6 @@ def set_badges(user_id, badges):
usr = Cosmetics(user_id)
usr.badges = json.dumps(badges)
db.session.add(usr)
db.session.commit()
def get_badges(user_id):
usr = db.session.query(Cosmetics).filter(Cosmetics.user_id == user_id).first()

1
webapp/titanembeds/database/guilds.py
View File

@@ -44,5 +44,4 @@ class Guilds(db.Model):
def set_unauthUsersBool(self, value):
self.unauth_users = value
db.session.commit()
return self.unauth_users

1
webapp/titanembeds/database/unauthenticated_bans.py
View File

@@ -26,7 +26,6 @@ class UnauthenticatedBans(db.Model):
def liftBan(self, lifter_id):
self.lifter_id = lifter_id
db.session.commit()
return self.lifter_id
def __repr__(self):

2
webapp/titanembeds/database/unauthenticated_users.py
View File

@@ -30,10 +30,8 @@ class UnauthenticatedUsers(db.Model):
def changeUsername(self, username):
self.username = username
db.session.commit()
return self.username
def revokeUser(self):
self.revoked = True
db.session.commit()
return self.revoked

1
webapp/titanembeds/utils.py
View File

@@ -142,7 +142,6 @@ def update_user_status(guild_id, username, user_key=None):
if dbUser.username != username or dbUser.ip_address != ip_address:
dbUser.username = username
dbUser.ip_address = ip_address
db.session.commit()
else:
status = {
'authenticated': True,