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

Revert "vxc" 

This reverts commit 4d0c7ba456.
remotes/1693045480750635534/spooky-22
Aevann1 2022-04-25 23:59:12 +02:00
parent babddb96db
commit 5c21180705
11 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
files/__main__.py
View File

@ -23,25 +23,25 @@ app.jinja_env.cache = {}
app.jinja_env.auto_reload = True
faulthandler.enable()
app.config["SITE_NAME"]=environ.get("SITE_NAME")
app.config["GUMROAD_LINK"]=environ.get("GUMROAD_LINK", "https://marsey1.gumroad.com/l/tfcvri")
app.config["SITE_NAME"]=environ.get("SITE_NAME").strip()
app.config["GUMROAD_LINK"]=environ.get("GUMROAD_LINK", "https://marsey1.gumroad.com/l/tfcvri").strip()
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
app.config['DATABASE_URL'] = environ.get("DATABASE_URL", "postgresql://postgres@localhost:5432")
app.config['SECRET_KEY'] = environ.get('MASTER_KEY')
app.config["SERVER_NAME"] = environ.get("DOMAIN").strip()
app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 3153600
app.config["SESSION_COOKIE_NAME"] = "session_" + environ.get("SITE_NAME").lower()
app.config["SESSION_COOKIE_NAME"] = "session_" + environ.get("SITE_NAME").strip().lower()
app.config["VERSION"] = "1.0.0"
app.config['MAX_CONTENT_LENGTH'] = 8 * 1024 * 1024
app.config["SESSION_COOKIE_SECURE"] = True
app.config["SESSION_COOKIE_SAMESITE"] = "Lax"
app.config["PERMANENT_SESSION_LIFETIME"] = 60 * 60 * 24 * 365
app.config["DEFAULT_COLOR"] = environ.get("DEFAULT_COLOR", "ff0000")
app.config["DEFAULT_THEME"] = environ.get("DEFAULT_THEME", "midnight")
app.config["DEFAULT_COLOR"] = environ.get("DEFAULT_COLOR", "ff0000").strip()
app.config["DEFAULT_THEME"] = environ.get("DEFAULT_THEME", "midnight").strip()
app.config["FORCE_HTTPS"] = 1
app.config["UserAgent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36"
app.config["HCAPTCHA_SITEKEY"] = environ.get("HCAPTCHA_SITEKEY","")
app.config["HCAPTCHA_SECRET"] = environ.get("HCAPTCHA_SECRET","")
app.config["HCAPTCHA_SITEKEY"] = environ.get("HCAPTCHA_SITEKEY","").strip()
app.config["HCAPTCHA_SECRET"] = environ.get("HCAPTCHA_SECRET","").strip()
app.config["SPAM_SIMILARITY_THRESHOLD"] = float(environ.get("SPAM_SIMILARITY_THRESHOLD", 0.5))
app.config["SPAM_URL_SIMILARITY_THRESHOLD"] = float(environ.get("SPAM_URL_SIMILARITY_THRESHOLD", 0.1))
app.config["SPAM_SIMILAR_COUNT_THRESHOLD"] = int(environ.get("SPAM_SIMILAR_COUNT_THRESHOLD", 10))
@ -52,9 +52,9 @@ app.config["CACHE_REDIS_URL"] = environ.get("REDIS_URL", "redis://localhost")
app.config['MAIL_SERVER'] = 'smtp.gmail.com'
app.config['MAIL_PORT'] = 587
app.config['MAIL_USE_TLS'] = True
app.config['MAIL_USERNAME'] = environ.get("MAIL_USERNAME", "")
app.config['MAIL_PASSWORD'] = environ.get("MAIL_PASSWORD", "")
app.config['DESCRIPTION'] = environ.get("DESCRIPTION", "rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all!")
app.config['MAIL_USERNAME'] = environ.get("MAIL_USERNAME", "").strip()
app.config['MAIL_PASSWORD'] = environ.get("MAIL_PASSWORD", "").strip()
app.config['DESCRIPTION'] = environ.get("DESCRIPTION", "rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all!").strip()
app.config['SETTINGS'] = {}
r=redis.Redis(host=environ.get("REDIS_URL", "redis://localhost"), decode_responses=True, ssl_cert_reqs=None)

4
files/classes/sub.py
View File

@ -6,8 +6,8 @@ from os import environ
from .sub_subscription import *
from .sub_block import *
SITE_NAME = environ.get("SITE_NAME", '')
SITE = environ.get("DOMAIN", '')
SITE_NAME = environ.get("SITE_NAME", '').strip()
SITE = environ.get("DOMAIN", '').strip()
if SITE == "localhost": SITE_FULL = 'http://' + SITE
else: SITE_FULL = 'https://' + SITE

4
files/classes/user.py
View File

@ -23,8 +23,8 @@ from files.helpers.security import *
import random
from os import environ, remove, path
defaulttheme = environ.get("DEFAULT_THEME", "midnight")
defaulttimefilter = environ.get("DEFAULT_TIME_FILTER", "all")
defaulttheme = environ.get("DEFAULT_THEME", "midnight").strip()
defaulttimefilter = environ.get("DEFAULT_TIME_FILTER", "all").strip()
cardview = bool(int(environ.get("CARD_VIEW", 1)))
class User(Base):

22
files/helpers/const.py
View File

File diff suppressed because one or more lines are too long

10
files/helpers/discord.py
View File

@ -3,11 +3,11 @@ import requests
import threading
from .const import *
SERVER_ID = environ.get("DISCORD_SERVER_ID",'')
CLIENT_ID = environ.get("DISCORD_CLIENT_ID",'')
CLIENT_SECRET = environ.get("DISCORD_CLIENT_SECRET",'')
BOT_TOKEN = environ.get("DISCORD_BOT_TOKEN",'')
AUTH = environ.get("DISCORD_AUTH",'')
SERVER_ID = environ.get("DISCORD_SERVER_ID",'').strip()
CLIENT_ID = environ.get("DISCORD_CLIENT_ID",'').strip()
CLIENT_SECRET = environ.get("DISCORD_CLIENT_SECRET",'').strip()
BOT_TOKEN = environ.get("DISCORD_BOT_TOKEN",'').strip()
AUTH = environ.get("DISCORD_AUTH",'').strip()
def discord_wrap(f):

2
files/mail/__init__.py
View File

@ -10,7 +10,7 @@ from files.classes import *
from files.__main__ import app, mail, limiter
from flask_mail import Message
name = environ.get("SITE_NAME")
name = environ.get("SITE_NAME").strip()
def send_mail(to_address, subject, html):

4
files/routes/admin.py
View File

@ -18,8 +18,8 @@ from datetime import datetime
import requests
from urllib.parse import quote, urlencode
GUMROAD_ID = environ.get("GUMROAD_ID", "tfcvri")
GUMROAD_TOKEN = environ.get("GUMROAD_TOKEN", "")
GUMROAD_ID = environ.get("GUMROAD_ID", "tfcvri").strip()
GUMROAD_TOKEN = environ.get("GUMROAD_TOKEN", "").strip()
month = datetime.now().strftime('%B')

8
files/routes/discord.py
View File

@ -4,10 +4,10 @@ from files.helpers.discord import add_role
from files.__main__ import app
import requests
SERVER_ID = environ.get("DISCORD_SERVER_ID",'')
CLIENT_ID = environ.get("DISCORD_CLIENT_ID",'')
CLIENT_SECRET = environ.get("DISCORD_CLIENT_SECRET",'')
BOT_TOKEN = environ.get("DISCORD_BOT_TOKEN")
SERVER_ID = environ.get("DISCORD_SERVER_ID",'').strip()
CLIENT_ID = environ.get("DISCORD_CLIENT_ID",'').strip()
CLIENT_SECRET = environ.get("DISCORD_CLIENT_SECRET",'').strip()
BOT_TOKEN = environ.get("DISCORD_BOT_TOKEN").strip()
DISCORD_ENDPOINT = "https://discordapp.com/api/v6"
WELCOME_CHANNEL="846509313941700618"

2
files/routes/feeds.py
View File

@ -24,7 +24,7 @@ def feeds_user(v=None, sort='hot', t='all'):
posts = get_posts(ids)
domain = environ.get("DOMAIN")
domain = environ.get("DOMAIN").strip()
doc, tag, text = Doc().tagtext()

2
files/routes/front.py
View File

@ -4,7 +4,7 @@ from files.helpers.discord import *
from files.__main__ import app, cache, limiter
from files.classes.submission import Submission
defaulttimefilter = environ.get("DEFAULT_TIME_FILTER", "all")
defaulttimefilter = environ.get("DEFAULT_TIME_FILTER", "all").strip()
@app.post("/clear")
@auth_required

4
files/routes/settings.py
View File

@ -13,8 +13,8 @@ from files.helpers.discord import add_role
from shutil import copyfile
import requests
GUMROAD_TOKEN = environ.get("GUMROAD_TOKEN", "")
GUMROAD_ID = environ.get("GUMROAD_ID", "tfcvri")
GUMROAD_TOKEN = environ.get("GUMROAD_TOKEN", "").strip()
GUMROAD_ID = environ.get("GUMROAD_ID", "tfcvri").strip()
tiers={
"(Paypig)": 1,