rDrama
/
rDrama
9
10
Fork 8
Code Issues Pull Requests Packages Releases Wiki Activity

Fix incompatible sqlalchemy imports that break docker container #102

Closed
mummified-corroding-granny wants to merge 2 commits from <deleted>:fix-incompatible-imports-new-sqlalchemy into master
pull from: <deleted>:fix-incompatible-imports-new-sqlalchemy
merge into: rDrama:master
Conversation 0 Commits 2 Files Changed 4
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/routes/admin.py
View File

@ -2,7 +2,7 @@ import time
from urllib.parse import quote, urlencode from urllib.parse import quote, urlencode
from math import floor from math import floor
from sqlalchemy import nullslast from sqlalchemy import nulls_last
from sqlalchemy.exc import IntegrityError from sqlalchemy.exc import IntegrityError
from psycopg2.errors import UniqueViolation from psycopg2.errors import UniqueViolation

2
files/routes/static.py
View File

@ -1,7 +1,7 @@
import os import os
from shutil import copyfile from shutil import copyfile
from sqlalchemy import func, nullslast from sqlalchemy import func, nulls_last
from files.helpers.media import process_files from files.helpers.media import process_files
import files.helpers.stats as statshelper import files.helpers.stats as statshelper

8
files/routes/subs.py
View File

@ -1,4 +1,4 @@
from sqlalchemy import nullslast from sqlalchemy import nulls_last
from files.classes import * from files.classes import *
from files.helpers.alerts import * from files.helpers.alerts import *
@ -201,7 +201,7 @@ def sub_exilees(v:User, sub):
abort(403) abort(403)
users = g.db.query(User, Exile).join(Exile, Exile.user_id==User.id) \ users = g.db.query(User, Exile).join(Exile, Exile.user_id==User.id) \
.filter_by(sub=sub.name) \ .filter_by(sub=sub.name) \
.order_by(nullslast(Exile.created_utc.desc()), User.username).all() .order_by(nulls_last(Exile.created_utc.desc()), User.username).all()
return render_template("sub/exilees.html", v=v, sub=sub, users=users) return render_template("sub/exilees.html", v=v, sub=sub, users=users)
@ -215,7 +215,7 @@ def sub_blockers(v:User, sub):
abort(403) abort(403)
users = g.db.query(User, SubBlock).join(SubBlock) \ users = g.db.query(User, SubBlock).join(SubBlock) \
.filter_by(sub=sub.name) \ .filter_by(sub=sub.name) \
.order_by(nullslast(SubBlock.created_utc.desc()), User.username).all() .order_by(nulls_last(SubBlock.created_utc.desc()), User.username).all()
return render_template("sub/blockers.html", return render_template("sub/blockers.html",
v=v, sub=sub, users=users, verb="blocking") v=v, sub=sub, users=users, verb="blocking")
@ -230,7 +230,7 @@ def sub_followers(v:User, sub):
abort(403) abort(403)
users = g.db.query(User, SubSubscription).join(SubSubscription) \ users = g.db.query(User, SubSubscription).join(SubSubscription) \
.filter_by(sub=sub.name) \ .filter_by(sub=sub.name) \
.order_by(nullslast(SubSubscription.created_utc.desc()), User.username).all() .order_by(nulls_last(SubSubscription.created_utc.desc()), User.username).all()
return render_template("sub/blockers.html", return render_template("sub/blockers.html",
v=v, sub=sub, users=users, verb="following") v=v, sub=sub, users=users, verb="following")

2
files/routes/users.py
View File

@ -7,7 +7,7 @@ from typing import Literal
import gevent import gevent
import qrcode import qrcode
from sqlalchemy import nullslast from sqlalchemy import nulls_last
from sqlalchemy.orm import aliased from sqlalchemy.orm import aliased
from files.classes import * from files.classes import *