diff --git a/docker-compose.yml b/docker-compose.yml index 13b3216ee..6f61ea300 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - MASTER_KEY=3435tdfsdudebussylmaoxxt43 - REDIS_URL=redis://redis - DOMAIN=localhost - - SITE_NAME=PCM + - SITE_NAME=Drama - GIPHY_KEY=3435tdfsdudebussylmaoxxt43 - DISCORD_SERVER_ID=3435tdfsdudebussylmaoxxt43 - DISCORD_CLIENT_ID=3435tdfsdudebussylmaoxxt43 diff --git a/files/routes/search.py b/files/routes/search.py index 98a2f272c..2ec37e0ea 100644 --- a/files/routes/search.py +++ b/files/routes/search.py @@ -302,5 +302,6 @@ def searchusers(v): users=[x for x in users.offset(25 * (page-1)).limit(26)] next_exists=(len(users)>25) users=users[:25] - + + if request.headers.get("Authorization"): return {"data": [x.json for x in users]} return render_template(f"{template}search_users.html", v=v, query=query, total=total, page=page, users=users, sort=sort, t=t, next_exists=next_exists) \ No newline at end of file diff --git a/files/routes/settings.py b/files/routes/settings.py index 72398bd5a..b2f412bab 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -365,11 +365,13 @@ def settings_profile_post(v): theme = request.values.get("theme") if theme: - if theme == "transparent" and not v.background: - return render_template(f"{template}settings_profile.html", v=v, error="You need to set a background to use the transparent theme!") - v.theme = theme - if theme == "win98": v.themecolor = "30409f" - updated = True + if theme in ["classic","transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"]: + if theme == "transparent" and not v.background: + return render_template(f"{template}settings_profile.html", v=v, error="You need to set a background to use the transparent theme!") + v.theme = theme + if theme == "win98": v.themecolor = "30409f" + updated = True + else: abort(400) theme2 = request.values.get("theme2") if theme2: @@ -640,7 +642,7 @@ def settings_security_post(v): g.db.commit() - return render_template("settings_security.html", v=v, error="Two-factor authentication enabled.") + return render_template("settings_security.html", v=v, msg="Two-factor authentication enabled.") if request.values.get("2fa_remove", ""): @@ -657,7 +659,7 @@ def settings_security_post(v): g.db.commit() - return render_template("settings_security.html", v=v, error="Two-factor authentication disabled.") + return render_template("settings_security.html", v=v, msg="Two-factor authentication disabled.") @app.post("/settings/log_out_all_others") @limiter.limit("1/second") diff --git a/files/templates/header.html b/files/templates/header.html index 8bc1f2d50..6c55c1707 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -117,7 +117,7 @@ Source code {% if request.host in ['rdrama.net', 'pcmemes.net'] %} - Report bugs or suggestions + Bugs/Suggestions {% endif %} {% if request.host != 'pcmemes.net' %} @@ -177,7 +177,7 @@ Source code {% if request.host in ['rdrama.net', 'pcmemes.net'] %} - Report bugs or suggestions + Bugs/Suggestions {% endif %} {% if request.host != 'pcmemes.net' %} diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html index 5c8b29114..5c7137480 100644 --- a/files/templates/settings_profile.html +++ b/files/templates/settings_profile.html @@ -111,7 +111,7 @@

Change the theme for the website.

- +