Merge branch 'frost' of https://github.com/Aevann1/Drama into frost

files/routes/oauth.py

@@ -5,6 +5,7 @@ from files.helpers.const import *
 from files.classes import *
 from flask import *
 from files.__main__ import app, limiter
+import sqlalchemy.exc
 
 @app.get("/authorize")
 @auth_required
@@ -24,11 +25,15 @@ def authorize(v):
 	application = g.db.query(OauthApp).filter_by(client_id=client_id).one_or_none()
 	if not application: return {"oauth_error": "Invalid `client_id`"}, 401
 	access_token = secrets.token_urlsafe(128)[:128]
-	new_auth = ClientAuth(oauth_client = application.id, user_id = v.id, access_token=access_token)
 
-	g.db.add(new_auth)
-
-	g.db.commit()
+	try:
+		new_auth = ClientAuth(oauth_client = application.id, user_id = v.id, access_token=access_token)
+		g.db.add(new_auth)
+		g.db.commit()
+	except sqlalchemy.exc.IntegrityError:
+		g.db.rollback()
+		old_auth = g.db.query(ClientAuth).filter_by(oauth_client = application.id, user_id = v.id).one()
+		access_token = old_auth.access_token
 
 	return redirect(f"{application.redirect_uri}?token={access_token}")
 

snappy.txt

@@ -3509,4 +3509,6 @@ And so i see your beautifull Bimboudders bound there 😳 holy fuck im going maa
 {[para]}
 This is more than just a fancy wank, this is basically getting off to the very idea of getting off. Like people that watch sissy hypnosis or whatever, they're masturbating on a meta level that I can't even comprehend. It's like trying to understand an alien mind.
 {[para]}
-fsd
+fsd
+{[para]}
+I recently got a DM telling me one of my posts have been posted on a site called Kiwifarms. I'm scared these people will continue to harass me. Is there anything I can do to stop this, it's depressing to live in a world where sites like this are still allowed to stay up. Maybe I could file some sort of copyright request.