fddf
parent
588b5075d0
commit
4af2ce2a53
|
@ -1,7 +1,7 @@
|
||||||
for theme in ['midnight', 'dark', 'light', 'coffee', 'tron', '4chan']:
|
for theme in ['midnight', 'dark', 'light', 'coffee', 'tron', '4chan']:
|
||||||
with open(f"./drama/assets/style/{theme}_ff66ac.css", encoding='utf-8') as t:
|
with open(f"./files/assets/style/{theme}_ff66ac.css", encoding='utf-8') as t:
|
||||||
text = t.read()
|
text = t.read()
|
||||||
for color in ['ff66ac','805ad5','62ca56','38a169','80ffff','2a96f3','62ca56','eb4963','ff0000','f39731','30409f','3e98a7','e4432d','7b9ae4','ec72de','7f8fa6', 'f8db58']:
|
for color in ['ff66ac','805ad5','62ca56','38a169','80ffff','2a96f3','62ca56','eb4963','ff0000','f39731','30409f','3e98a7','e4432d','7b9ae4','ec72de','7f8fa6', 'f8db58']:
|
||||||
newtext = text.replace("ff66ac", color).replace("ff4097", color).replace("ff1a83", color).replace("ff3390", color).replace("rgba(255, 102, 172, 0.25)", color)
|
newtext = text.replace("ff66ac", color).replace("ff4097", color).replace("ff1a83", color).replace("ff3390", color).replace("rgba(255, 102, 172, 0.25)", color)
|
||||||
with open(f"./drama/assets/style/{theme}_{color}.css", encoding='utf-8', mode='w') as nt:
|
with open(f"./files/assets/style/{theme}_{color}.css", encoding='utf-8', mode='w') as nt:
|
||||||
nt.write(newtext)
|
nt.write(newtext)
|
|
@ -1,2 +0,0 @@
|
||||||
|
|
||||||
from drama.__main__ import Base, app
|
|
|
@ -196,9 +196,9 @@ UA_BAN_CACHE_TTL = int(environ.get("UA_BAN_CACHE_TTL", 3600))
|
||||||
|
|
||||||
|
|
||||||
# import and bind all routing functions
|
# import and bind all routing functions
|
||||||
import drama.classes
|
import files.classes
|
||||||
from drama.routes import *
|
from files.routes import *
|
||||||
import drama.helpers.jinja2
|
import files.helpers.jinja2
|
||||||
|
|
||||||
@cache.memoize(UA_BAN_CACHE_TTL)
|
@cache.memoize(UA_BAN_CACHE_TTL)
|
||||||
def get_useragent_ban_response(user_agent_str):
|
def get_useragent_ban_response(user_agent_str):
|
||||||
|
@ -210,8 +210,8 @@ def get_useragent_ban_response(user_agent_str):
|
||||||
# return False, (None, None)
|
# return False, (None, None)
|
||||||
|
|
||||||
result = g.db.query(
|
result = g.db.query(
|
||||||
drama.classes.Agent).filter(
|
files.classes.Agent).filter(
|
||||||
drama.classes.Agent.kwd.in_(
|
files.classes.Agent.kwd.in_(
|
||||||
user_agent_str.split())).first()
|
user_agent_str.split())).first()
|
||||||
if result:
|
if result:
|
||||||
return True, (result.mock or "Follow the robots.txt, dumbass",
|
return True, (result.mock or "Follow the robots.txt, dumbass",
|
|
@ -1,5 +1,5 @@
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from drama.__main__ import Base
|
from files.__main__ import Base
|
||||||
|
|
||||||
class Agent(Base):
|
class Agent(Base):
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from drama.__main__ import Base
|
from files.__main__ import Base
|
||||||
|
|
||||||
|
|
||||||
class Alt(Base):
|
class Alt(Base):
|
|
@ -1,6 +1,6 @@
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
from drama.__main__ import Base
|
from files.__main__ import Base
|
||||||
|
|
||||||
AWARDS = {
|
AWARDS = {
|
||||||
"ban": {
|
"ban": {
|
|
@ -1,7 +1,7 @@
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
|
|
||||||
from drama.__main__ import Base, app
|
from files.__main__ import Base, app
|
||||||
|
|
||||||
|
|
||||||
class BadgeDef(Base):
|
class BadgeDef(Base):
|
|
@ -5,7 +5,7 @@ from sqlalchemy.orm import relationship, lazyload
|
||||||
from .mix_ins import Stndrd
|
from .mix_ins import Stndrd
|
||||||
from .submission import Submission
|
from .submission import Submission
|
||||||
from .comment import Comment
|
from .comment import Comment
|
||||||
from drama.__main__ import Base
|
from files.__main__ import Base
|
||||||
|
|
||||||
class OauthApp(Base, Stndrd):
|
class OauthApp(Base, Stndrd):
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
from flask import *
|
from flask import *
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from sqlalchemy.orm import relationship, deferred
|
from sqlalchemy.orm import relationship, deferred
|
||||||
from drama.helpers.lazy import lazy
|
from files.helpers.lazy import lazy
|
||||||
from drama.__main__ import Base
|
from files.__main__ import Base
|
||||||
from .mix_ins import *
|
from .mix_ins import *
|
||||||
from .flags import CommentFlag
|
from .flags import CommentFlag
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from drama.__main__ import Base
|
from files.__main__ import Base
|
||||||
|
|
||||||
class BannedDomain(Base):
|
class BannedDomain(Base):
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
from drama.__main__ import Base
|
from files.__main__ import Base
|
||||||
from .mix_ins import *
|
from .mix_ins import *
|
||||||
|
|
||||||
class Flag(Base, Stndrd):
|
class Flag(Base, Stndrd):
|
|
@ -1,6 +1,6 @@
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from flask import g
|
from flask import g
|
||||||
from drama.__main__ import Base
|
from files.__main__ import Base
|
||||||
|
|
||||||
|
|
||||||
class Image(Base):
|
class Image(Base):
|
|
@ -0,0 +1,2 @@
|
||||||
|
|
||||||
|
from files.__main__ import Base, app
|
|
@ -1,4 +1,4 @@
|
||||||
from drama.helpers.lazy import lazy
|
from files.helpers.lazy import lazy
|
||||||
import math
|
import math
|
||||||
import random
|
import random
|
||||||
import time
|
import time
|
|
@ -1,6 +1,6 @@
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
from drama.__main__ import Base
|
from files.__main__ import Base
|
||||||
from .mix_ins import *
|
from .mix_ins import *
|
||||||
import time
|
import time
|
||||||
|
|
|
@ -3,8 +3,8 @@ from sqlalchemy import *
|
||||||
from sqlalchemy.orm import relationship, deferred
|
from sqlalchemy.orm import relationship, deferred
|
||||||
import re, random
|
import re, random
|
||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
from drama.helpers.lazy import lazy
|
from files.helpers.lazy import lazy
|
||||||
from drama.__main__ import Base
|
from files.__main__ import Base
|
||||||
from .mix_ins import *
|
from .mix_ins import *
|
||||||
from .flags import *
|
from .flags import *
|
||||||
from os import environ
|
from os import environ
|
|
@ -1,6 +1,6 @@
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
from drama.__main__ import Base
|
from files.__main__ import Base
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,8 @@ from sqlalchemy.orm import deferred, contains_eager, aliased
|
||||||
from secrets import token_hex
|
from secrets import token_hex
|
||||||
import pyotp
|
import pyotp
|
||||||
|
|
||||||
from drama.helpers.discord import delete_role
|
from files.helpers.discord import delete_role
|
||||||
from drama.helpers.images import *
|
from files.helpers.images import *
|
||||||
from .alts import Alt
|
from .alts import Alt
|
||||||
from .submission import SaveRelationship
|
from .submission import SaveRelationship
|
||||||
from .comment import Notification
|
from .comment import Notification
|
||||||
|
@ -11,8 +11,8 @@ from .subscriptions import *
|
||||||
from .userblock import *
|
from .userblock import *
|
||||||
from .badges import *
|
from .badges import *
|
||||||
from .clients import *
|
from .clients import *
|
||||||
from drama.__main__ import Base, cache
|
from files.__main__ import Base, cache
|
||||||
from drama.helpers.security import *
|
from files.helpers.security import *
|
||||||
|
|
||||||
site = environ.get("domain").strip()
|
site = environ.get("domain").strip()
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
from .mix_ins import *
|
from .mix_ins import *
|
||||||
from drama.__main__ import Base
|
from files.__main__ import Base
|
||||||
|
|
||||||
class UserBlock(Base, Stndrd, Age_times):
|
class UserBlock(Base, Stndrd, Age_times):
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
from flask import *
|
from flask import *
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
from drama.__main__ import Base
|
from files.__main__ import Base
|
||||||
|
|
||||||
class Vote(Base):
|
class Vote(Base):
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import mistletoe
|
import mistletoe
|
||||||
|
|
||||||
from drama.classes import *
|
from files.classes import *
|
||||||
from flask import g
|
from flask import g
|
||||||
from .markdown import *
|
from .markdown import *
|
||||||
from .sanitize import *
|
from .sanitize import *
|
|
@ -1,7 +1,7 @@
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
from flask import *
|
from flask import *
|
||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
from drama.classes import BannedDomain
|
from files.classes import BannedDomain
|
||||||
|
|
||||||
def filter_comment_html(html_text):
|
def filter_comment_html(html_text):
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
from drama.classes import *
|
from files.classes import *
|
||||||
from flask import g
|
from flask import g
|
||||||
from sqlalchemy.orm import joinedload, aliased
|
from sqlalchemy.orm import joinedload, aliased
|
||||||
|
|
|
@ -2,7 +2,7 @@ import requests
|
||||||
from os import environ
|
from os import environ
|
||||||
from PIL import Image as IImage, ImageSequence
|
from PIL import Image as IImage, ImageSequence
|
||||||
import base64
|
import base64
|
||||||
from drama.classes.images import *
|
from files.classes.images import *
|
||||||
|
|
||||||
CF_KEY = environ.get("CLOUDFLARE_KEY").strip()
|
CF_KEY = environ.get("CLOUDFLARE_KEY").strip()
|
||||||
CF_ZONE = environ.get("CLOUDFLARE_ZONE").strip()
|
CF_ZONE = environ.get("CLOUDFLARE_ZONE").strip()
|
|
@ -1,6 +1,6 @@
|
||||||
from os import environ, path
|
from os import environ, path
|
||||||
from .get import *
|
from .get import *
|
||||||
from drama.__main__ import app, cache
|
from files.__main__ import app, cache
|
||||||
|
|
||||||
|
|
||||||
@app.template_filter("total_users")
|
@app.template_filter("total_users")
|
||||||
|
@ -14,7 +14,7 @@ def total_users(x):
|
||||||
@cache.memoize(timeout=60 * 60 * 24)
|
@cache.memoize(timeout=60 * 60 * 24)
|
||||||
def source_code(file_name):
|
def source_code(file_name):
|
||||||
|
|
||||||
return open(path.expanduser('~') + '/drama/' +
|
return open(path.expanduser('~') + '/files/' +
|
||||||
file_name, mode="r+").read()
|
file_name, mode="r+").read()
|
||||||
|
|
||||||
|
|
|
@ -183,7 +183,7 @@ def sanitize(text, linkgen=False, flair=False):
|
||||||
if flair: emojisize = 20
|
if flair: emojisize = 20
|
||||||
else: emojisize = 30
|
else: emojisize = 30
|
||||||
for i in re.finditer(':(.{1,30}?):', sanitized):
|
for i in re.finditer(':(.{1,30}?):', sanitized):
|
||||||
if path.isfile(f'./drama/assets/images/emojis/{i.group(1)}.gif'):
|
if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.gif'):
|
||||||
sanitized = sanitized.replace(f':{i.group(1)}:', f'<img data-toggle="tooltip" title="{i.group(1)}" delay="0" height={emojisize} src="https://{site}/assets/images/emojis/{i.group(1)}.gif"<span>')
|
sanitized = sanitized.replace(f':{i.group(1)}:', f'<img data-toggle="tooltip" title="{i.group(1)}" delay="0" height={emojisize} src="https://{site}/assets/images/emojis/{i.group(1)}.gif"<span>')
|
||||||
|
|
||||||
sanitized = sanitized.replace("https://www.", "https://").replace("https://youtu.be/", "https://youtube.com/embed/").replace("https://music.youtube.com/watch?v=", "https://youtube.com/embed/").replace("/watch?v=", "/embed/").replace("https://open.spotify.com/", "https://open.spotify.com/embed/").replace("https://streamable.com/", "https://streamable.com/e/").replace("https://youtube.com/shorts/", "https://youtube.com/embed/")
|
sanitized = sanitized.replace("https://www.", "https://").replace("https://youtu.be/", "https://youtube.com/embed/").replace("https://music.youtube.com/watch?v=", "https://youtube.com/embed/").replace("/watch?v=", "/embed/").replace("https://open.spotify.com/", "https://open.spotify.com/embed/").replace("https://streamable.com/", "https://streamable.com/e/").replace("https://youtube.com/shorts/", "https://youtube.com/embed/")
|
|
@ -3,7 +3,7 @@ from sqlalchemy.sql import visitors
|
||||||
from werkzeug.wrappers.response import Response as RespObj
|
from werkzeug.wrappers.response import Response as RespObj
|
||||||
from .get import *
|
from .get import *
|
||||||
from .alerts import send_notification
|
from .alerts import send_notification
|
||||||
from drama.__main__ import app
|
from files.__main__ import app
|
||||||
|
|
||||||
|
|
||||||
def get_logged_in_user():
|
def get_logged_in_user():
|
|
@ -4,10 +4,10 @@ import time
|
||||||
from flask import *
|
from flask import *
|
||||||
from urllib.parse import quote
|
from urllib.parse import quote
|
||||||
|
|
||||||
from drama.helpers.security import *
|
from files.helpers.security import *
|
||||||
from drama.helpers.wrappers import *
|
from files.helpers.wrappers import *
|
||||||
from drama.classes import *
|
from files.classes import *
|
||||||
from drama.__main__ import app
|
from files.__main__ import app
|
||||||
|
|
||||||
site = environ.get("domain").strip()
|
site = environ.get("domain").strip()
|
||||||
mailgun_domain = environ.get("MAILGUN_DOMAIN").strip()
|
mailgun_domain = environ.get("MAILGUN_DOMAIN").strip()
|
|
@ -5,17 +5,17 @@ import imagehash
|
||||||
from os import remove
|
from os import remove
|
||||||
from PIL import Image as IMAGE
|
from PIL import Image as IMAGE
|
||||||
|
|
||||||
from drama.helpers.wrappers import *
|
from files.helpers.wrappers import *
|
||||||
from drama.helpers.alerts import *
|
from files.helpers.alerts import *
|
||||||
from drama.helpers.sanitize import *
|
from files.helpers.sanitize import *
|
||||||
from drama.helpers.markdown import *
|
from files.helpers.markdown import *
|
||||||
from drama.helpers.security import *
|
from files.helpers.security import *
|
||||||
from drama.helpers.get import *
|
from files.helpers.get import *
|
||||||
from drama.helpers.images import *
|
from files.helpers.images import *
|
||||||
from drama.classes import *
|
from files.classes import *
|
||||||
from flask import *
|
from flask import *
|
||||||
import matplotlib.pyplot as plt
|
import matplotlib.pyplot as plt
|
||||||
from drama.__main__ import app, cache
|
from files.__main__ import app, cache
|
||||||
from .front import frontlist
|
from .front import frontlist
|
||||||
|
|
||||||
@app.get("/admin/shadowbanned")
|
@app.get("/admin/shadowbanned")
|
|
@ -1,8 +1,8 @@
|
||||||
from drama.__main__ import app
|
from files.__main__ import app
|
||||||
from drama.helpers.wrappers import *
|
from files.helpers.wrappers import *
|
||||||
from drama.helpers.alerts import *
|
from files.helpers.alerts import *
|
||||||
from drama.helpers.get import *
|
from files.helpers.get import *
|
||||||
from drama.classes.award import *
|
from files.classes.award import *
|
||||||
from flask import g, request
|
from flask import g, request
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
from drama.helpers.wrappers import *
|
from files.helpers.wrappers import *
|
||||||
from drama.helpers.filters import *
|
from files.helpers.filters import *
|
||||||
from drama.helpers.alerts import *
|
from files.helpers.alerts import *
|
||||||
from drama.helpers.images import *
|
from files.helpers.images import *
|
||||||
from drama.helpers.session import *
|
from files.helpers.session import *
|
||||||
from drama.classes import *
|
from files.classes import *
|
||||||
from drama.routes.front import comment_idlist
|
from files.routes.front import comment_idlist
|
||||||
from pusher_push_notifications import PushNotifications
|
from pusher_push_notifications import PushNotifications
|
||||||
|
|
||||||
from flask import *
|
from flask import *
|
||||||
from drama.__main__ import app, limiter
|
from files.__main__ import app, limiter
|
||||||
|
|
||||||
site = environ.get("domain").strip()
|
site = environ.get("domain").strip()
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
from drama.helpers.wrappers import *
|
from files.helpers.wrappers import *
|
||||||
from drama.helpers.security import *
|
from files.helpers.security import *
|
||||||
from drama.helpers.discord import add_role
|
from files.helpers.discord import add_role
|
||||||
from drama.__main__ import app
|
from files.__main__ import app
|
||||||
|
|
||||||
SERVER_ID = environ.get("DISCORD_SERVER_ID",'').strip()
|
SERVER_ID = environ.get("DISCORD_SERVER_ID",'').strip()
|
||||||
CLIENT_ID = environ.get("DISCORD_CLIENT_ID",'').strip()
|
CLIENT_ID = environ.get("DISCORD_CLIENT_ID",'').strip()
|
|
@ -1,11 +1,11 @@
|
||||||
import jinja2.exceptions
|
import jinja2.exceptions
|
||||||
|
|
||||||
from drama.helpers.wrappers import *
|
from files.helpers.wrappers import *
|
||||||
from drama.helpers.session import *
|
from files.helpers.session import *
|
||||||
from flask import *
|
from flask import *
|
||||||
from urllib.parse import quote, urlencode
|
from urllib.parse import quote, urlencode
|
||||||
import time
|
import time
|
||||||
from drama.__main__ import app
|
from files.__main__ import app
|
||||||
|
|
||||||
# Errors
|
# Errors
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import html
|
import html
|
||||||
from .front import frontlist
|
from .front import frontlist
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from drama.helpers.jinja2 import full_link
|
from files.helpers.jinja2 import full_link
|
||||||
from drama.helpers.get import *
|
from files.helpers.get import *
|
||||||
from yattag import Doc
|
from yattag import Doc
|
||||||
|
|
||||||
from drama.__main__ import app
|
from files.__main__ import app
|
||||||
|
|
||||||
@app.get('/rss/<sort>/<t>')
|
@app.get('/rss/<sort>/<t>')
|
||||||
def feeds_user(sort='hot', t='all'):
|
def feeds_user(sort='hot', t='all'):
|
|
@ -1,8 +1,8 @@
|
||||||
from drama.helpers.wrappers import *
|
from files.helpers.wrappers import *
|
||||||
from drama.helpers.get import *
|
from files.helpers.get import *
|
||||||
from flask import g
|
from flask import g
|
||||||
from drama.__main__ import app
|
from files.__main__ import app
|
||||||
from drama.helpers.sanitize import sanitize
|
from files.helpers.sanitize import sanitize
|
||||||
|
|
||||||
@app.post("/flag/post/<pid>")
|
@app.post("/flag/post/<pid>")
|
||||||
@auth_desired
|
@auth_desired
|
|
@ -1,8 +1,8 @@
|
||||||
from drama.helpers.wrappers import *
|
from files.helpers.wrappers import *
|
||||||
from drama.helpers.get import *
|
from files.helpers.get import *
|
||||||
|
|
||||||
from drama.__main__ import app, cache
|
from files.__main__ import app, cache
|
||||||
from drama.classes.submission import Submission
|
from files.classes.submission import Submission
|
||||||
|
|
||||||
@app.get("/post/")
|
@app.get("/post/")
|
||||||
def slash_post():
|
def slash_post():
|
|
@ -1,6 +1,6 @@
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
from drama.mail import *
|
from files.mail import *
|
||||||
from drama.__main__ import app, limiter
|
from files.__main__ import app, limiter
|
||||||
|
|
||||||
valid_username_regex = re.compile("^[a-zA-Z0-9_\-]{3,25}$")
|
valid_username_regex = re.compile("^[a-zA-Z0-9_\-]{3,25}$")
|
||||||
valid_password_regex = re.compile("^.{8,100}$")
|
valid_password_regex = re.compile("^.{8,100}$")
|
|
@ -1,9 +1,9 @@
|
||||||
from drama.helpers.wrappers import *
|
from files.helpers.wrappers import *
|
||||||
from drama.helpers.alerts import *
|
from files.helpers.alerts import *
|
||||||
from drama.helpers.get import *
|
from files.helpers.get import *
|
||||||
from drama.classes import *
|
from files.classes import *
|
||||||
from flask import *
|
from flask import *
|
||||||
from drama.__main__ import app
|
from files.__main__ import app
|
||||||
|
|
||||||
@app.get("/authorize")
|
@app.get("/authorize")
|
||||||
@auth_required
|
@auth_required
|
|
@ -3,18 +3,18 @@ import mistletoe
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
import gevent
|
import gevent
|
||||||
|
|
||||||
from drama.helpers.wrappers import *
|
from files.helpers.wrappers import *
|
||||||
from drama.helpers.sanitize import *
|
from files.helpers.sanitize import *
|
||||||
from drama.helpers.filters import *
|
from files.helpers.filters import *
|
||||||
from drama.helpers.markdown import *
|
from files.helpers.markdown import *
|
||||||
from drama.helpers.session import *
|
from files.helpers.session import *
|
||||||
from drama.helpers.thumbs import *
|
from files.helpers.thumbs import *
|
||||||
from drama.helpers.alerts import send_notification
|
from files.helpers.alerts import send_notification
|
||||||
from drama.helpers.discord import send_message
|
from files.helpers.discord import send_message
|
||||||
from drama.classes import *
|
from files.classes import *
|
||||||
from flask import *
|
from flask import *
|
||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
from drama.__main__ import app, limiter, cache
|
from files.__main__ import app, limiter, cache
|
||||||
from PIL import Image as PILimage
|
from PIL import Image as PILimage
|
||||||
from .front import frontlist
|
from .front import frontlist
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
from drama.helpers.wrappers import *
|
from files.helpers.wrappers import *
|
||||||
import re
|
import re
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from flask import *
|
from flask import *
|
||||||
from drama.__main__ import app, cache
|
from files.__main__ import app, cache
|
||||||
import random
|
import random
|
||||||
|
|
||||||
query_regex=re.compile("(\w+):(\S+)")
|
query_regex=re.compile("(\w+):(\S+)")
|
|
@ -1,11 +1,11 @@
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
from drama.helpers.alerts import *
|
from files.helpers.alerts import *
|
||||||
from drama.helpers.sanitize import *
|
from files.helpers.sanitize import *
|
||||||
from drama.helpers.filters import filter_comment_html
|
from files.helpers.filters import filter_comment_html
|
||||||
from drama.helpers.markdown import *
|
from files.helpers.markdown import *
|
||||||
from drama.helpers.discord import remove_user, set_nick
|
from files.helpers.discord import remove_user, set_nick
|
||||||
from drama.mail import *
|
from files.mail import *
|
||||||
from drama.__main__ import app, cache
|
from files.__main__ import app, cache
|
||||||
import youtube_dl
|
import youtube_dl
|
||||||
from .front import frontlist
|
from .front import frontlist
|
||||||
|
|
||||||
|
@ -454,7 +454,7 @@ def settings_block_user(v):
|
||||||
return {"error": f"You have already blocked @{user.username}."}, 409
|
return {"error": f"You have already blocked @{user.username}."}, 409
|
||||||
|
|
||||||
if user.id == 1046:
|
if user.id == 1046:
|
||||||
return {"error": "You can't block @Drama."}, 409
|
return {"error": "You can't block @files."}, 409
|
||||||
|
|
||||||
new_block = UserBlock(user_id=v.id,
|
new_block = UserBlock(user_id=v.id,
|
||||||
target_id=user.id,
|
target_id=user.id,
|
|
@ -1,6 +1,6 @@
|
||||||
from drama.mail import *
|
from files.mail import *
|
||||||
from drama.__main__ import app, limiter
|
from files.__main__ import app, limiter
|
||||||
from drama.helpers.alerts import *
|
from files.helpers.alerts import *
|
||||||
|
|
||||||
site = environ.get("domain").strip()
|
site = environ.get("domain").strip()
|
||||||
|
|
|
@ -2,13 +2,13 @@ import qrcode
|
||||||
import io
|
import io
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from drama.classes.user import ViewerRelationship
|
from files.classes.user import ViewerRelationship
|
||||||
from drama.helpers.alerts import *
|
from files.helpers.alerts import *
|
||||||
from drama.helpers.sanitize import *
|
from files.helpers.sanitize import *
|
||||||
from drama.helpers.markdown import *
|
from files.helpers.markdown import *
|
||||||
from drama.mail import *
|
from files.mail import *
|
||||||
from flask import *
|
from flask import *
|
||||||
from drama.__main__ import app, limiter
|
from files.__main__ import app, limiter
|
||||||
from pusher_push_notifications import PushNotifications
|
from pusher_push_notifications import PushNotifications
|
||||||
|
|
||||||
site = environ.get("domain").strip()
|
site = environ.get("domain").strip()
|
|
@ -1,8 +1,8 @@
|
||||||
from drama.helpers.wrappers import *
|
from files.helpers.wrappers import *
|
||||||
from drama.helpers.get import *
|
from files.helpers.get import *
|
||||||
from drama.classes import *
|
from files.classes import *
|
||||||
from flask import *
|
from flask import *
|
||||||
from drama.__main__ import app
|
from files.__main__ import app
|
||||||
|
|
||||||
|
|
||||||
@app.get("/votes")
|
@app.get("/votes")
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue