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

fuck this noise

pull/219/head
Aevann 2023-12-04 17:31:03 +02:00
parent 510da6c97a
commit 69548d02d8
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
files/assets/images/rDrama/banner_error.webp 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

5
files/routes/errors.py
View File

@ -6,7 +6,7 @@ from flask import redirect, render_template, request, session, g
from files.helpers.config.const import *
from files.helpers.settings import get_setting
from files.routes.wrappers import rpath, get_logged_in_user
from files.routes.wrappers import rpath
from files.__main__ import app, limiter
@ -38,8 +38,7 @@ def error(e):
if request.headers.get("Authorization") or request.headers.get("xhr"):
return {"error": title, "code": e.code, "description": msg, "details": details}, e.code
img = ERROR_MARSEYS.get(e.code, 'marseyl')
v = get_logged_in_user()
return render_template('errors/error.html', title=title, msg=msg, details=details, img=img, v=v), e.code
return render_template('errors/error.html', err=True, title=title, msg=msg, details=details, img=img), e.code
@app.errorhandler(401)
def error_401(e):

1
files/routes/wrappers.py
View File

@ -45,7 +45,6 @@ def calc_users():
if session["session_id"] in loggedout: del loggedout[session["session_id"]]
loggedin[v.id] = timestamp
else:
g.agent = request.headers.get("User-Agent", "")
ua = str(user_agents.parse(g.agent))
if 'spider' not in ua.lower() and 'bot' not in ua.lower():
loggedout[session["session_id"]] = (timestamp, ua)

6
files/templates/default.html
View File

@ -8,7 +8,7 @@
{% endblock %}
{% block banner %}
{% include "modals/expanded_image.html" %}
{% if not request.path.startswith('/@') %}
{% if err or '@' not in request.path %}
{% if IS_FISTMAS() and not (hole and hole.bannerurls) %}
{% include 'events/fistmas/banner.html' %}
{% elif IS_HOMOWEEN() and not (hole and hole.bannerurls) %}
@ -16,7 +16,9 @@
{% else %}
{% set path = "files/assets/images/" ~ SITE_NAME %}
{% if hole and hole.bannerurls %}
{% if err and SITE_NAME == 'rDrama' %}
{% set src = "banner_error.webp" | asset_siteimg %}
{% elif hole and hole.bannerurls %}
{% set src = hole.random_banner %}
{% set alt = ['/h/', hole, ' banner']|join %}
{% set class = 'site-banner-hole' %}

2
files/templates/errors/WPD/404.html
View File

@ -84,7 +84,7 @@
<div class="banner-wrapper">
<div style="padding: 0 0 12.2%">
<div>
<img data-nonce="mOsrnhRn4Q6MNQo_EGzmHGSnk8HTNbBR-p_bI4uDwg" data-onclick="False" class="site-banner" alt="site banner" src="https://i.watchpeopledie.tv/assets/images/WPD/banners/1.webp?x=6">
<img data-nonce="mOsrnhRn4Q6MNQo_EGzmHGSnk8HTNbBR-p_bI4uDwg" data-onclick="False" class="site-banner" alt="site banner" src="https://i.watchpeopledie.tv/i/WPD/cached.webp?x=6">
</div>
</div>
</div>

2
files/templates/errors/WPD/502.html
View File

@ -84,7 +84,7 @@
<div class="banner-wrapper">
<div style="padding: 0 0 12.2%">
<div>
<img data-nonce="mOsrnhRn4Q6MNQo_EGzmHGSnk8HTNbBR-p_bI4uDwg" data-onclick="False" class="site-banner" alt="site banner" src="https://i.watchpeopledie.tv/assets/images/WPD/banners/1.webp?x=6">
<img data-nonce="mOsrnhRn4Q6MNQo_EGzmHGSnk8HTNbBR-p_bI4uDwg" data-onclick="False" class="site-banner" alt="site banner" src="https://i.watchpeopledie.tv/i/WPD/cached.webp?x=6">
</div>
</div>
</div>

4
files/templates/errors/rDrama/404.html
View File

@ -80,11 +80,11 @@
</div>
</div>
</div>
<a id="banner-link" href="https://donate.transequality.org/a/ncte" rel="noopener">
<a id="banner-link" href="https://i.rdrama.net/i/rDrama/banner_error.webp?x=6" rel="noopener">
<div class="banner-wrapper">
<div style="padding: 0 0 12.2%">
<div>
<img data-nonce="5H-21jAb-z_O0Mnhe-QNb8TssXAm5E_SLJz57SdR_g" data-onclick="False" class="site-banner" alt="site banner" src="https://i.rdrama.net/assets/images/rDrama/banners/1.webp?x=6">
<img data-nonce="5H-21jAb-z_O0Mnhe-QNb8TssXAm5E_SLJz57SdR_g" data-onclick="expandImage()" class="site-banner" alt="site banner" src="https://i.rdrama.net/i/rDrama/banner_error.webp?x=6">
</div>
</div>
</div>

4
files/templates/errors/rDrama/502.html
View File

@ -80,11 +80,11 @@
</div>
</div>
</div>
<a id="banner-link" href="https://donate.transequality.org/a/ncte" rel="noopener">
<a id="banner-link" href="https://i.rdrama.net/i/rDrama/banner_error.webp?x=6" rel="noopener">
<div class="banner-wrapper">
<div style="padding: 0 0 12.2%">
<div>
<img data-nonce="5H-21jAb-z_O0Mnhe-QNb8TssXAm5E_SLJz57SdR_g" data-onclick="False" class="site-banner" alt="site banner" src="https://i.rdrama.net/assets/images/rDrama/banners/1.webp?x=6">
<img data-nonce="5H-21jAb-z_O0Mnhe-QNb8TssXAm5E_SLJz57SdR_g" data-onclick="expandImage()" class="site-banner" alt="site banner" src="https://i.rdrama.net/i/rDrama/banner_error.webp?x=6">
</div>
</div>
</div>

2
files/templates/header.html
View File

@ -169,7 +169,7 @@
{% if not request.path.startswith('/search/') %}
<div class="flex-grow-1 d-fl {% if not v %}pad{% endif %}">
<form class="form-inline search d-mob-none flex-nowrap mx-0 mx-lg-auto mb-0" action="{% if request.path.startswith('/search') %}{{request.path}}{% else %}/search/posts/{% endif %}" method="get">
<form class="form-inline search d-mob-none flex-nowrap mx-0 mx-lg-auto mb-0" {% if err %}style="margin-right:40rem!important"{% endif %} action="{% if request.path.startswith('/search') %}{{request.path}}{% else %}/search/posts/{% endif %}" method="get">
<input autocomplete="off" class="form-control w-100" type="search" placeholder="{{search_placeholder}}" name="q" value="{{request.values.get('q', '')}}">
<span class="input-group-append">
<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem">