diff --git a/.gitignore b/.gitignore index 3cda725bb..9b0099a63 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -ruqquscache/ +dramacache/ # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/appspec.yml b/appspec.yml index e31c52105..0ab4dac11 100644 --- a/appspec.yml +++ b/appspec.yml @@ -2,12 +2,12 @@ version: 0.0 os: linux files: - source: / - destination: ruqqus + destination: drama permissions: - - object: ruqqus/* + - object: drama/* mode: 4755 hooks: AfterInstall: - location: scripts/install_pip ApplicationStart: - - location: scripts/start_ruqqus \ No newline at end of file + - location: scripts/start_drama \ No newline at end of file diff --git a/compilecss.py b/compilecss.py index 0249fb3f6..9d973a25d 100644 --- a/compilecss.py +++ b/compilecss.py @@ -1,7 +1,7 @@ for theme in ['dark', 'light', 'coffee', 'tron', '4chan']: - with open(f"D:/#D/ruqqus/assets/style/{theme}_ff66ac.css", encoding='utf-8') as t: + with open(f"D:/#D/drama/assets/style/{theme}_ff66ac.css", encoding='utf-8') as t: text = t.read() for color in ['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) - with open(f"D:/#D/ruqqus/assets/style/{theme}_{color}.css", encoding='utf-8', mode='w') as nt: + with open(f"D:/#D/drama/assets/style/{theme}_{color}.css", encoding='utf-8', mode='w') as nt: nt.write(newtext) \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 85a71ce94..250316542 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2.3' services: - ruqqus: + drama: build: context: . volumes: @@ -20,7 +20,7 @@ services: - CLOUDFLARE_ZONE=vcxvdfgfc6r554etrgd - CLOUDFLARE_KEY=vcxvdfgfc6r554etrgd - TENOR_KEY=vcxvdfgfc6r554etrgd - - S3_BUCKET_NAME=i.ruqqus.ga + - S3_BUCKET_NAME=i.drama.ga - AWS_ACCESS_KEY_ID=vcxvdfgfc6r554etrgd - AWS_SECRET_ACCESS_KEY=vcxvdfgfc6r554etrgd - MAILGUN_KEY=vcxvdfgfc6r554etrgd diff --git a/ruqqus/__main__.py b/drama/__main__.py similarity index 94% rename from ruqqus/__main__.py rename to drama/__main__.py index c5a30d082..ade82ae4d 100644 --- a/ruqqus/__main__.py +++ b/drama/__main__.py @@ -41,11 +41,11 @@ app = Flask(__name__, app.wsgi_app = ProxyFix(app.wsgi_app, x_for=3) app.url_map.strict_slashes = False -app.config["SITE_NAME"]=environ.get("SITE_NAME", "Ruqqus").strip() +app.config["SITE_NAME"]=environ.get("SITE_NAME", "Drama").strip() app.config["SITE_COLOR"]=environ.get("SITE_COLOR", "805ad5").strip() -app.config["RUQQUSPATH"]=environ.get("RUQQUSPATH", os.path.dirname(os.path.realpath(__file__))) +app.config["DRAMAPATH"]=environ.get("DRAMAPATH", os.path.dirname(os.path.realpath(__file__))) app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False app.config['DATABASE_URL'] = environ.get( @@ -64,7 +64,7 @@ app.config["SERVER_NAME"] = environ.get( "SERVER_NAME", "")).strip() app.config["SHORT_DOMAIN"]=environ.get("SHORT_DOMAIN","").strip() -app.config["SESSION_COOKIE_NAME"] = "session_ruqqus" +app.config["SESSION_COOKIE_NAME"] = "session_drama" app.config["VERSION"] = _version app.config['MAX_CONTENT_LENGTH'] = 64 * 1024 * 1024 app.config["SESSION_COOKIE_SECURE"] = bool(int(environ.get("FORCE_HTTPS", 1))) @@ -85,7 +85,7 @@ if "localhost" in app.config["SERVER_NAME"]: else: app.config["CACHE_TYPE"] = environ.get("CACHE_TYPE", 'filesystem').strip() -app.config["CACHE_DIR"] = environ.get("CACHE_DIR", "ruqquscache") +app.config["CACHE_DIR"] = environ.get("CACHE_DIR", "dramacache") # captcha configs app.config["HCAPTCHA_SITEKEY"] = environ.get("HCAPTCHA_SITEKEY","").strip() @@ -228,9 +228,9 @@ UA_BAN_CACHE_TTL = int(environ.get("UA_BAN_CACHE_TTL", 3600)) # import and bind all routing functions -import ruqqus.classes -from ruqqus.routes import * -import ruqqus.helpers.jinja2 +import drama.classes +from drama.routes import * +import drama.helpers.jinja2 @cache.memoize(UA_BAN_CACHE_TTL) def get_useragent_ban_response(user_agent_str): @@ -242,8 +242,8 @@ def get_useragent_ban_response(user_agent_str): # return False, (None, None) result = g.db.query( - ruqqus.classes.Agent).filter( - ruqqus.classes.Agent.kwd.in_( + drama.classes.Agent).filter( + drama.classes.Agent.kwd.in_( user_agent_str.split())).first() if result: return True, (result.mock or "Follow the robots.txt, dumbass", @@ -314,7 +314,7 @@ def log_event(name, link): url = os.environ.get("DISCORD_WEBHOOK") headers = {"Content-Type": "application/json"} - data = {"username": "ruqqus", + data = {"username": "drama", "content": text } diff --git a/ruqqus/classes/__init__.py b/drama/classes/__init__.py similarity index 100% rename from ruqqus/classes/__init__.py rename to drama/classes/__init__.py diff --git a/ruqqus/classes/alts.py b/drama/classes/alts.py similarity index 90% rename from ruqqus/classes/alts.py rename to drama/classes/alts.py index 7a8786706..5bc5c16d8 100644 --- a/ruqqus/classes/alts.py +++ b/drama/classes/alts.py @@ -1,5 +1,5 @@ from sqlalchemy import * -from ruqqus.__main__ import Base +from drama.__main__ import Base class Alt(Base): diff --git a/ruqqus/classes/badges.py b/drama/classes/badges.py similarity index 97% rename from ruqqus/classes/badges.py rename to drama/classes/badges.py index e02d7d49a..3ea94782a 100644 --- a/ruqqus/classes/badges.py +++ b/drama/classes/badges.py @@ -2,7 +2,7 @@ from flask import render_template from sqlalchemy import * from sqlalchemy.orm import relationship -from ruqqus.__main__ import Base, app +from drama.__main__ import Base, app class BadgeDef(Base): diff --git a/ruqqus/classes/board_relationships.py b/drama/classes/board_relationships.py similarity index 99% rename from ruqqus/classes/board_relationships.py rename to drama/classes/board_relationships.py index d9ba474f4..56059b6d7 100644 --- a/ruqqus/classes/board_relationships.py +++ b/drama/classes/board_relationships.py @@ -1,6 +1,6 @@ from sqlalchemy import * from sqlalchemy.orm import relationship -from ruqqus.__main__ import Base, cache +from drama.__main__ import Base, cache from .mix_ins import * import time diff --git a/ruqqus/classes/boards.py b/drama/classes/boards.py similarity index 99% rename from ruqqus/classes/boards.py rename to drama/classes/boards.py index 7759b1ab5..6945b243a 100644 --- a/ruqqus/classes/boards.py +++ b/drama/classes/boards.py @@ -4,7 +4,7 @@ from .submission import * from .board_relationships import * from .comment import Comment from .mix_ins import * -from ruqqus.__main__ import Base, cache +from drama.__main__ import Base, cache class Board(Base, Stndrd, Age_times): diff --git a/ruqqus/classes/clients.py b/drama/classes/clients.py similarity index 98% rename from ruqqus/classes/clients.py rename to drama/classes/clients.py index f6dbf48d2..9e7ac3300 100644 --- a/ruqqus/classes/clients.py +++ b/drama/classes/clients.py @@ -5,7 +5,7 @@ from sqlalchemy.orm import relationship, lazyload from .mix_ins import Stndrd from .submission import Submission from .comment import Comment -from ruqqus.__main__ import Base +from drama.__main__ import Base class OauthApp(Base, Stndrd): diff --git a/ruqqus/classes/comment.py b/drama/classes/comment.py similarity index 99% rename from ruqqus/classes/comment.py rename to drama/classes/comment.py index 3a5d6d0ca..b41585475 100644 --- a/ruqqus/classes/comment.py +++ b/drama/classes/comment.py @@ -3,9 +3,9 @@ from sqlalchemy import * from sqlalchemy.orm import relationship, deferred from sqlalchemy.ext.associationproxy import association_proxy from .mix_ins import * -from ruqqus.helpers.base36 import * -from ruqqus.helpers.lazy import lazy -from ruqqus.__main__ import Base +from drama.helpers.base36 import * +from drama.helpers.lazy import lazy +from drama.__main__ import Base from .votes import CommentVote class CommentAux(Base): diff --git a/ruqqus/classes/custom_errors.py b/drama/classes/custom_errors.py similarity index 100% rename from ruqqus/classes/custom_errors.py rename to drama/classes/custom_errors.py diff --git a/ruqqus/classes/domains.py b/drama/classes/domains.py similarity index 96% rename from ruqqus/classes/domains.py rename to drama/classes/domains.py index 7adaa7ba3..84fdeff18 100644 --- a/ruqqus/classes/domains.py +++ b/drama/classes/domains.py @@ -1,5 +1,5 @@ from sqlalchemy import * -from ruqqus.__main__ import Base +from drama.__main__ import Base reasons = { 1: "URL shorteners are not allowed.", diff --git a/ruqqus/classes/flags.py b/drama/classes/flags.py similarity index 97% rename from ruqqus/classes/flags.py rename to drama/classes/flags.py index 996b20d1e..6110459c6 100644 --- a/ruqqus/classes/flags.py +++ b/drama/classes/flags.py @@ -1,6 +1,6 @@ from sqlalchemy import * from sqlalchemy.orm import relationship -from ruqqus.__main__ import Base +from drama.__main__ import Base from .mix_ins import * class Flag(Base, Stndrd): diff --git a/ruqqus/classes/images.py b/drama/classes/images.py similarity index 95% rename from ruqqus/classes/images.py rename to drama/classes/images.py index adeefde37..6ff9d4b15 100644 --- a/ruqqus/classes/images.py +++ b/drama/classes/images.py @@ -1,6 +1,6 @@ from sqlalchemy import * from flask import g -from ruqqus.__main__ import Base +from drama.__main__ import Base class Image(Base): diff --git a/ruqqus/classes/ips.py b/drama/classes/ips.py similarity index 94% rename from ruqqus/classes/ips.py rename to drama/classes/ips.py index 85f69ed0b..c9655601f 100644 --- a/ruqqus/classes/ips.py +++ b/drama/classes/ips.py @@ -1,5 +1,5 @@ from sqlalchemy import * -from ruqqus.__main__ import Base +from drama.__main__ import Base class IP(Base): diff --git a/ruqqus/classes/mix_ins.py b/drama/classes/mix_ins.py similarity index 97% rename from ruqqus/classes/mix_ins.py rename to drama/classes/mix_ins.py index 46bc9da5c..4d2bd8aa9 100644 --- a/ruqqus/classes/mix_ins.py +++ b/drama/classes/mix_ins.py @@ -1,5 +1,5 @@ -from ruqqus.helpers.base36 import * -from ruqqus.helpers.lazy import lazy +from drama.helpers.base36 import * +from drama.helpers.lazy import lazy import math import random import time diff --git a/ruqqus/classes/mod_logs.py b/drama/classes/mod_logs.py similarity index 99% rename from ruqqus/classes/mod_logs.py rename to drama/classes/mod_logs.py index fdcc541e0..b4c678f39 100644 --- a/ruqqus/classes/mod_logs.py +++ b/drama/classes/mod_logs.py @@ -1,6 +1,6 @@ from sqlalchemy import * from sqlalchemy.orm import relationship -from ruqqus.__main__ import Base +from drama.__main__ import Base from .mix_ins import * import time diff --git a/ruqqus/classes/paypal.py b/drama/classes/paypal.py similarity index 99% rename from ruqqus/classes/paypal.py rename to drama/classes/paypal.py index 346df08d0..59fd94a1e 100644 --- a/ruqqus/classes/paypal.py +++ b/drama/classes/paypal.py @@ -3,7 +3,7 @@ from os import environ from sqlalchemy import * from sqlalchemy.orm import relationship from .mix_ins import * -from ruqqus.__main__ import Base, app +from drama.__main__ import Base, app PAYPAL_ID=environ.get("PAYPAL_CLIENT_ID", "").strip() PAYPAL_SECRET=environ.get("PAYPAL_CLIENT_SECRET", "").strip() diff --git a/ruqqus/classes/submission.py b/drama/classes/submission.py similarity index 98% rename from ruqqus/classes/submission.py rename to drama/classes/submission.py index ff42ab1dc..23ea2e97b 100644 --- a/ruqqus/classes/submission.py +++ b/drama/classes/submission.py @@ -4,9 +4,9 @@ from sqlalchemy.orm import relationship, deferred import re, random from urllib.parse import urlparse from .mix_ins import * -from ruqqus.helpers.base36 import * -from ruqqus.helpers.lazy import lazy -from ruqqus.__main__ import Base +from drama.helpers.base36 import * +from drama.helpers.lazy import lazy +from drama.__main__ import Base class SubmissionAux(Base): @@ -282,7 +282,7 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing): if self.over_18: return f"/assets/images/nsfw.png" elif self.has_thumb: if self.thumburl: return self.thumburl - else: return f"https://s3.eu-central-1.amazonaws.com/i.ruqqus.ga/posts/{self.base36id}/thumb.png" + else: return f"https://s3.eu-central-1.amazonaws.com/i.drama.ga/posts/{self.base36id}/thumb.png" elif self.is_image: return self.url else: diff --git a/ruqqus/classes/subscriptions.py b/drama/classes/subscriptions.py similarity index 95% rename from ruqqus/classes/subscriptions.py rename to drama/classes/subscriptions.py index 4dbf70af1..560ab8b16 100644 --- a/ruqqus/classes/subscriptions.py +++ b/drama/classes/subscriptions.py @@ -1,6 +1,6 @@ from sqlalchemy import * from sqlalchemy.orm import relationship -from ruqqus.__main__ import Base +from drama.__main__ import Base import time diff --git a/ruqqus/classes/titles.py b/drama/classes/titles.py similarity index 96% rename from ruqqus/classes/titles.py rename to drama/classes/titles.py index 9a265b0c7..4fe67c23a 100644 --- a/ruqqus/classes/titles.py +++ b/drama/classes/titles.py @@ -1,6 +1,6 @@ from sqlalchemy import * from flask import render_template -from ruqqus.__main__ import Base +from drama.__main__ import Base class Title(Base): diff --git a/ruqqus/classes/user.py b/drama/classes/user.py similarity index 98% rename from ruqqus/classes/user.py rename to drama/classes/user.py index cb143570a..01fa2598e 100644 --- a/ruqqus/classes/user.py +++ b/drama/classes/user.py @@ -2,8 +2,8 @@ from sqlalchemy.orm import deferred, contains_eager, aliased from secrets import token_hex import pyotp -from ruqqus.helpers.discord import delete_role -from ruqqus.helpers.aws import * +from drama.helpers.discord import delete_role +from drama.helpers.aws import * from .alts import Alt from .titles import Title from .submission import SaveRelationship @@ -15,8 +15,8 @@ from .userblock import * from .badges import * from .clients import * from .paypal import PayPalTxn -from ruqqus.__main__ import Base, cache -from ruqqus.helpers.security import * +from drama.__main__ import Base, cache +from drama.helpers.security import * class User(Base, Stndrd, Age_times): __tablename__ = "users" @@ -617,7 +617,7 @@ class User(Base, Stndrd, Age_times): if self.bannerurl: return self.bannerurl else: - return f"https://s3.eu-central-1.amazonaws.com/i.ruqqus.ga/uid/{self.base36id}/banner-{self.banner_nonce}.png" + return f"https://s3.eu-central-1.amazonaws.com/i.drama.ga/uid/{self.base36id}/banner-{self.banner_nonce}.png" else: return "/assets/images/default_bg.png" @@ -632,7 +632,7 @@ class User(Base, Stndrd, Age_times): if self.profileurl: return self.profileurl else: - return f"https://s3.eu-central-1.amazonaws.com/i.ruqqus.ga/uid/{self.base36id}/profile-{self.profile_nonce}.png" + return f"https://s3.eu-central-1.amazonaws.com/i.drama.ga/uid/{self.base36id}/profile-{self.profile_nonce}.png" else: return self.defaultpicture() diff --git a/ruqqus/classes/userblock.py b/drama/classes/userblock.py similarity index 94% rename from ruqqus/classes/userblock.py rename to drama/classes/userblock.py index de01ec89c..5c523c2ca 100644 --- a/ruqqus/classes/userblock.py +++ b/drama/classes/userblock.py @@ -1,7 +1,7 @@ from sqlalchemy import * from sqlalchemy.orm import relationship from .mix_ins import * -from ruqqus.__main__ import Base +from drama.__main__ import Base class UserBlock(Base, Stndrd, Age_times): diff --git a/ruqqus/classes/votes.py b/drama/classes/votes.py similarity index 97% rename from ruqqus/classes/votes.py rename to drama/classes/votes.py index b1aa34b3e..a249c5374 100644 --- a/ruqqus/classes/votes.py +++ b/drama/classes/votes.py @@ -2,8 +2,8 @@ from flask import * from time import time from sqlalchemy import * from sqlalchemy.orm import relationship -from ruqqus.helpers.base36 import * -from ruqqus.__main__ import Base +from drama.helpers.base36 import * +from drama.__main__ import Base class Vote(Base): diff --git a/ruqqus/helpers/alerts.py b/drama/helpers/alerts.py similarity index 99% rename from ruqqus/helpers/alerts.py rename to drama/helpers/alerts.py index 570d53499..ef620a3c0 100644 --- a/ruqqus/helpers/alerts.py +++ b/drama/helpers/alerts.py @@ -1,6 +1,6 @@ import mistletoe -from ruqqus.classes import * +from drama.classes import * from flask import g from .markdown import * from .sanitize import * diff --git a/ruqqus/helpers/aws.py b/drama/helpers/aws.py similarity index 98% rename from ruqqus/helpers/aws.py rename to drama/helpers/aws.py index 12458efb6..23b7bfd6a 100644 --- a/ruqqus/helpers/aws.py +++ b/drama/helpers/aws.py @@ -8,8 +8,8 @@ import imagehash from os import remove import base64 import io -from ruqqus.classes.images import * -from ruqqus.__main__ import db_session +from drama.classes.images import * +from drama.__main__ import db_session from .base36 import hex2bin CF_KEY = environ.get("CLOUDFLARE_KEY").strip() diff --git a/ruqqus/helpers/base36.py b/drama/helpers/base36.py similarity index 100% rename from ruqqus/helpers/base36.py rename to drama/helpers/base36.py diff --git a/ruqqus/helpers/discord.py b/drama/helpers/discord.py similarity index 100% rename from ruqqus/helpers/discord.py rename to drama/helpers/discord.py diff --git a/ruqqus/helpers/embed.py b/drama/helpers/embed.py similarity index 88% rename from ruqqus/helpers/embed.py rename to drama/helpers/embed.py index a030a9d11..c785d29f5 100644 --- a/ruqqus/helpers/embed.py +++ b/drama/helpers/embed.py @@ -2,11 +2,11 @@ import re from urllib.parse import * import requests from os import environ -from ruqqus.__main__ import app +from drama.__main__ import app youtube_regex = re.compile("^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|shorts\/|\&v=)([^#\&\?]*).*") -ruqqus_regex = re.compile("^.*rdrama.net/post/+\w+/(\w+)(/\w+/(\w+))?") +drama_regex = re.compile("^.*rdrama.net/post/+\w+/(\w+)(/\w+/(\w+))?") twitter_regex=re.compile("/status/(\d+)") @@ -33,9 +33,9 @@ def youtube_embed(url): return f"https://youtube.com/embed/{yt_id}" -def ruqqus_embed(url): +def drama_embed(url): - matches = re.match(ruqqus_regex, url) + matches = re.match(drama_regex, url) post_id = matches.group(1) comment_id = matches.group(3) diff --git a/ruqqus/helpers/filters.py b/drama/helpers/filters.py similarity index 95% rename from ruqqus/helpers/filters.py rename to drama/helpers/filters.py index c69cdc0cc..bf24a3739 100644 --- a/ruqqus/helpers/filters.py +++ b/drama/helpers/filters.py @@ -1,7 +1,7 @@ from bs4 import BeautifulSoup from flask import * from urllib.parse import urlparse -from ruqqus.classes import Domain +from drama.classes import Domain def filter_comment_html(html_text): diff --git a/ruqqus/helpers/get.py b/drama/helpers/get.py similarity index 99% rename from ruqqus/helpers/get.py rename to drama/helpers/get.py index 1abdca1c9..58baeeb83 100644 --- a/ruqqus/helpers/get.py +++ b/drama/helpers/get.py @@ -1,4 +1,4 @@ -from ruqqus.classes import * +from drama.classes import * from flask import g from sqlalchemy.orm import joinedload, aliased diff --git a/ruqqus/helpers/jinja2.py b/drama/helpers/jinja2.py similarity index 92% rename from ruqqus/helpers/jinja2.py rename to drama/helpers/jinja2.py index 2c80862e2..7fdbba229 100644 --- a/ruqqus/helpers/jinja2.py +++ b/drama/helpers/jinja2.py @@ -1,7 +1,7 @@ from os import environ, path import calendar from .get import * -from ruqqus.__main__ import app, cache +from drama.__main__ import app, cache @app.template_filter("total_users") @@ -15,7 +15,7 @@ def total_users(x): @cache.memoize(timeout=60 * 60 * 24) def source_code(file_name): - return open(path.expanduser('~') + '/ruqqus/' + + return open(path.expanduser('~') + '/drama/' + file_name, mode="r+").read() diff --git a/ruqqus/helpers/lazy.py b/drama/helpers/lazy.py similarity index 100% rename from ruqqus/helpers/lazy.py rename to drama/helpers/lazy.py diff --git a/ruqqus/helpers/markdown.py b/drama/helpers/markdown.py similarity index 100% rename from ruqqus/helpers/markdown.py rename to drama/helpers/markdown.py diff --git a/ruqqus/helpers/redis.py b/drama/helpers/redis.py similarity index 100% rename from ruqqus/helpers/redis.py rename to drama/helpers/redis.py diff --git a/ruqqus/helpers/sanitize.py b/drama/helpers/sanitize.py similarity index 97% rename from ruqqus/helpers/sanitize.py rename to drama/helpers/sanitize.py index b4c1a54fb..54bdba869 100644 --- a/ruqqus/helpers/sanitize.py +++ b/drama/helpers/sanitize.py @@ -72,7 +72,7 @@ def a_modify(attrs, new=False): attrs[(None, "rel")] = "nofollow noopener" # Force https for all external links in comments - # (Ruqqus already forces its own https) + # (Drama already forces its own https) new_url = ParseResult(scheme="https", netloc=parsed_url.netloc, path=parsed_url.path, @@ -191,7 +191,7 @@ def sanitize(text, linkgen=False, flair=False): if flair: emojisize = 20 else: emojisize = 30 for i in re.finditer(':(.{1,30}?):', sanitized): - if os.path.isfile(f'/d/ruqqus/assets/images/emojis/{i.group(1)}.gif'): + if os.path.isfile(f'/d/drama/assets/images/emojis/{i.group(1)}.gif'): sanitized = sanitized.replace(f':{i.group(1)}:', f'') 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/") diff --git a/ruqqus/helpers/security.py b/drama/helpers/security.py similarity index 100% rename from ruqqus/helpers/security.py rename to drama/helpers/security.py diff --git a/ruqqus/helpers/session.py b/drama/helpers/session.py similarity index 100% rename from ruqqus/helpers/session.py rename to drama/helpers/session.py diff --git a/ruqqus/helpers/sqla_values.py b/drama/helpers/sqla_values.py similarity index 100% rename from ruqqus/helpers/sqla_values.py rename to drama/helpers/sqla_values.py diff --git a/ruqqus/helpers/thumbs.py b/drama/helpers/thumbs.py similarity index 100% rename from ruqqus/helpers/thumbs.py rename to drama/helpers/thumbs.py diff --git a/ruqqus/helpers/wrappers.py b/drama/helpers/wrappers.py similarity index 99% rename from ruqqus/helpers/wrappers.py rename to drama/helpers/wrappers.py index be30e8873..9efcf94ef 100644 --- a/ruqqus/helpers/wrappers.py +++ b/drama/helpers/wrappers.py @@ -1,7 +1,7 @@ from werkzeug.wrappers.response import Response as RespObj from .get import * from .alerts import send_notification -from ruqqus.__main__ import Base, app, db_session +from drama.__main__ import Base, app, db_session def get_logged_in_user(db=None): diff --git a/ruqqus/mail/__init__.py b/drama/mail/__init__.py similarity index 100% rename from ruqqus/mail/__init__.py rename to drama/mail/__init__.py diff --git a/ruqqus/mail/mail.py b/drama/mail/mail.py similarity index 94% rename from ruqqus/mail/mail.py rename to drama/mail/mail.py index a42412f82..e0c0e1ab8 100644 --- a/ruqqus/mail/mail.py +++ b/drama/mail/mail.py @@ -4,10 +4,10 @@ import time from flask import * from urllib.parse import quote -from ruqqus.helpers.security import * -from ruqqus.helpers.wrappers import * -from ruqqus.classes import * -from ruqqus.__main__ import app +from drama.helpers.security import * +from drama.helpers.wrappers import * +from drama.classes import * +from drama.__main__ import app def send_mail(to_address, subject, html, plaintext=None, files={}, diff --git a/ruqqus/routes/__init__.py b/drama/routes/__init__.py similarity index 100% rename from ruqqus/routes/__init__.py rename to drama/routes/__init__.py diff --git a/ruqqus/routes/admin.py b/drama/routes/admin.py similarity index 98% rename from ruqqus/routes/admin.py rename to drama/routes/admin.py index 5c6220a24..d2a093b7e 100644 --- a/ruqqus/routes/admin.py +++ b/drama/routes/admin.py @@ -9,20 +9,20 @@ import imagehash from os import remove from PIL import Image as IMAGE -from ruqqus.helpers.wrappers import * -from ruqqus.helpers.alerts import * -from ruqqus.helpers.base36 import * -from ruqqus.helpers.sanitize import * -from ruqqus.helpers.markdown import * -from ruqqus.helpers.security import * -from ruqqus.helpers.get import * -from ruqqus.helpers.aws import * -from ruqqus.classes import * -from ruqqus.classes.domains import reasons as REASONS +from drama.helpers.wrappers import * +from drama.helpers.alerts import * +from drama.helpers.base36 import * +from drama.helpers.sanitize import * +from drama.helpers.markdown import * +from drama.helpers.security import * +from drama.helpers.get import * +from drama.helpers.aws import * +from drama.classes import * +from drama.classes.domains import reasons as REASONS from flask import * import matplotlib.pyplot as plt from .front import frontlist -from ruqqus.__main__ import app, cache +from drama.__main__ import app, cache @app.route("/admin/shadowbanned", methods=["GET"]) diff --git a/ruqqus/routes/boards.py b/drama/routes/boards.py similarity index 97% rename from ruqqus/routes/boards.py rename to drama/routes/boards.py index 45de3e9fb..7830e0f25 100644 --- a/ruqqus/routes/boards.py +++ b/drama/routes/boards.py @@ -1,8 +1,8 @@ -from ruqqus.helpers.wrappers import * -from ruqqus.helpers.alerts import * -from ruqqus.classes import * +from drama.helpers.wrappers import * +from drama.helpers.alerts import * +from drama.classes import * from flask import * -from ruqqus.__main__ import app, limiter, cache +from drama.__main__ import app, limiter, cache valid_board_regex = re.compile("^[a-zA-Z0-9][a-zA-Z0-9_]{2,24}$") diff --git a/ruqqus/routes/comments.py b/drama/routes/comments.py similarity index 98% rename from ruqqus/routes/comments.py rename to drama/routes/comments.py index 3bd26c9ce..0fa929ae3 100644 --- a/ruqqus/routes/comments.py +++ b/drama/routes/comments.py @@ -1,16 +1,16 @@ import threading -from ruqqus.helpers.wrappers import * -from ruqqus.helpers.filters import * -from ruqqus.helpers.alerts import * -from ruqqus.helpers.aws import * -from ruqqus.helpers.session import * -from ruqqus.classes import * -from ruqqus.routes.front import comment_idlist +from drama.helpers.wrappers import * +from drama.helpers.filters import * +from drama.helpers.alerts import * +from drama.helpers.aws import * +from drama.helpers.session import * +from drama.classes import * +from drama.routes.front import comment_idlist from pusher_push_notifications import PushNotifications from flask import * -from ruqqus.__main__ import app, limiter +from drama.__main__ import app, limiter choices = ['Wow, you must be a JP fan.', 'This is one of the worst posts I have EVER seen. Delete it.', "No, don't reply like this, please do another wall of unhinged rant please.", '# šŸ˜“šŸ˜“šŸ˜“', "Ma'am we've been over this before. You need to stop.", "I've known more coherent downies.", "Your pulitzer's in the mail", "That's great and all, but I asked for my burger without cheese.", 'That degree finally paying off', "That's nice sweaty. Why don't you have a seat in the time out corner with Pizzashill until you calm down, then you can have your Capri Sun.", "All them words won't bring your pa back.", "You had a chance to not be completely worthless, but it looks like you threw it away. At least you're consistent.", 'Some people are able to display their intelligence by going on at length on a subject and never actually saying anything. This ability is most common in trades such as politics, public relations, and law. You have impressed me by being able to best them all, while still coming off as an absolute idiot.', "You can type 10,000 characters and you decided that these were the one's that you wanted.", 'Have you owned the libs yet?', "I don't know what you said, because I've seen another human naked.", 'Impressive. Normally people with such severe developmental disabilities struggle to write much more than a sentence or two. He really has exceded our expectations for the writing portion. Sadly the coherency of his writing, along with his abilities in the social skills and reading portions, are far behind his peers with similar disabilities.', "This is a really long way of saying you don't fuck.", "Sorry ma'am, looks like his delusions have gotten worse. We'll have to admit him,", 'https://i.kym-cdn.com/photos/images/newsfeed/001/038/094/0a1.jpg', 'If only you could put that energy into your relationships', 'Posts like this is why I do Heroine.', 'still unemployed then?', 'K', 'look im gunna have 2 ask u 2 keep ur giant dumps in the toilet not in my replys šŸ˜·šŸ˜·šŸ˜·', "Mommy is soooo proud of you, sweaty. Let's put this sperg out up on the fridge with all your other failures.", "Good job bobby, here's a star", "That was a mistake. You're about to find out the hard way why.", 'You sat down and wrote all this shit. You could have done so many other things with your life. What happened to your life that made you decide writing novels of bullshit on reddit was the best option?', "I don't have enough spoons to read this shit", "All those words won't bring daddy back.", 'OUT!', "Mommy is soooo proud of you, sweaty. Let's put this sperg out up on the fridge with all your other failures."] @@ -434,7 +434,7 @@ def api_comment(v): # g.db.commit() # csam_thread=threading.Thread(target=check_csam_url, - # args=(f"https://s3.eu-central-1.amazonaws.com/i.ruqqus.ga/{name}", + # args=(f"https://s3.eu-central-1.amazonaws.com/i.drama.ga/{name}", # v, # del_function # ) @@ -811,7 +811,7 @@ def edit_comment(cid, v): # g.db.commit() # csam_thread=threading.Thread(target=check_csam_url, - # args=(f"https://s3.eu-central-1.amazonaws.com/i.ruqqus.ga/{name}", + # args=(f"https://s3.eu-central-1.amazonaws.com/i.drama.ga/{name}", # v, # del_function # ) diff --git a/ruqqus/routes/discord.py b/drama/routes/discord.py similarity index 95% rename from ruqqus/routes/discord.py rename to drama/routes/discord.py index f89df7b4c..0cdba38e6 100644 --- a/ruqqus/routes/discord.py +++ b/drama/routes/discord.py @@ -1,7 +1,7 @@ -from ruqqus.helpers.wrappers import * -from ruqqus.helpers.security import * -from ruqqus.helpers.discord import add_role, delete_role -from ruqqus.__main__ import app +from drama.helpers.wrappers import * +from drama.helpers.security import * +from drama.helpers.discord import add_role, delete_role +from drama.__main__ import app SERVER_ID = environ.get("DISCORD_SERVER_ID",'').strip() CLIENT_ID = environ.get("DISCORD_CLIENT_ID",'').strip() diff --git a/ruqqus/routes/errors.py b/drama/routes/errors.py similarity index 96% rename from ruqqus/routes/errors.py rename to drama/routes/errors.py index e3f1ec5ac..4f9a477f6 100644 --- a/ruqqus/routes/errors.py +++ b/drama/routes/errors.py @@ -1,10 +1,10 @@ -from ruqqus.helpers.wrappers import * -from ruqqus.helpers.session import * -from ruqqus.classes.custom_errors import * +from drama.helpers.wrappers import * +from drama.helpers.session import * +from drama.classes.custom_errors import * from flask import * from urllib.parse import quote, urlencode import time -from ruqqus.__main__ import app, r, cache, db_session +from drama.__main__ import app, r, cache, db_session import gevent # Errors diff --git a/ruqqus/routes/feeds.py b/drama/routes/feeds.py similarity index 92% rename from ruqqus/routes/feeds.py rename to drama/routes/feeds.py index d96b09e86..90385002b 100644 --- a/ruqqus/routes/feeds.py +++ b/drama/routes/feeds.py @@ -1,11 +1,11 @@ import html from .front import frontlist from datetime import datetime -from ruqqus.helpers.jinja2 import full_link -from ruqqus.helpers.get import * +from drama.helpers.jinja2 import full_link +from drama.helpers.get import * from yattag import Doc -from ruqqus.__main__ import app +from drama.__main__ import app @app.route('/rss//', methods=["GET"]) def feeds_user(sort='hot', t='all'): diff --git a/ruqqus/routes/flagging.py b/drama/routes/flagging.py similarity index 88% rename from ruqqus/routes/flagging.py rename to drama/routes/flagging.py index 60521dce1..b7fc52813 100644 --- a/ruqqus/routes/flagging.py +++ b/drama/routes/flagging.py @@ -1,7 +1,7 @@ -from ruqqus.helpers.wrappers import * -from ruqqus.helpers.get import * +from drama.helpers.wrappers import * +from drama.helpers.get import * from flask import g -from ruqqus.__main__ import app +from drama.__main__ import app @app.route("/api/flag/post/", methods=["POST"]) diff --git a/ruqqus/routes/front.py b/drama/routes/front.py similarity index 98% rename from ruqqus/routes/front.py rename to drama/routes/front.py index fda1a2d95..26c559f70 100644 --- a/ruqqus/routes/front.py +++ b/drama/routes/front.py @@ -1,8 +1,8 @@ -from ruqqus.helpers.wrappers import * -from ruqqus.helpers.get import * +from drama.helpers.wrappers import * +from drama.helpers.get import * -from ruqqus.__main__ import app, cache -from ruqqus.classes.submission import Submission +from drama.__main__ import app, cache +from drama.classes.submission import Submission @app.route("/post/", methods=["GET"]) def slash_post(): diff --git a/ruqqus/routes/login.py b/drama/routes/login.py similarity index 99% rename from ruqqus/routes/login.py rename to drama/routes/login.py index 0449db4c3..c78a509f5 100644 --- a/ruqqus/routes/login.py +++ b/drama/routes/login.py @@ -1,6 +1,6 @@ from urllib.parse import urlencode -from ruqqus.mail import * -from ruqqus.__main__ import app, limiter +from drama.mail import * +from drama.__main__ import app, limiter valid_username_regex = re.compile("^[a-zA-Z0-9_\-]{3,25}$") valid_password_regex = re.compile("^.{8,100}$") diff --git a/ruqqus/routes/oauth.py b/drama/routes/oauth.py similarity index 98% rename from ruqqus/routes/oauth.py rename to drama/routes/oauth.py index 3e921026a..e50cecb5b 100644 --- a/ruqqus/routes/oauth.py +++ b/drama/routes/oauth.py @@ -1,9 +1,9 @@ -from ruqqus.helpers.wrappers import * -from ruqqus.helpers.alerts import * -from ruqqus.helpers.get import * -from ruqqus.classes import * +from drama.helpers.wrappers import * +from drama.helpers.alerts import * +from drama.helpers.get import * +from drama.classes import * from flask import * -from ruqqus.__main__ import app +from drama.__main__ import app SCOPES = { 'identity': 'See your username', diff --git a/ruqqus/routes/posts.py b/drama/routes/posts.py similarity index 98% rename from ruqqus/routes/posts.py rename to drama/routes/posts.py index dd5073d98..5d5432314 100644 --- a/ruqqus/routes/posts.py +++ b/drama/routes/posts.py @@ -4,20 +4,20 @@ import urllib.parse import threading import gevent -from ruqqus.helpers.wrappers import * -from ruqqus.helpers.sanitize import * -from ruqqus.helpers.filters import * -from ruqqus.helpers.embed import * -from ruqqus.helpers.markdown import * -from ruqqus.helpers.session import * -from ruqqus.helpers.thumbs import * -from ruqqus.helpers.alerts import send_notification -from ruqqus.helpers.discord import send_message -from ruqqus.classes import * +from drama.helpers.wrappers import * +from drama.helpers.sanitize import * +from drama.helpers.filters import * +from drama.helpers.embed import * +from drama.helpers.markdown import * +from drama.helpers.session import * +from drama.helpers.thumbs import * +from drama.helpers.alerts import send_notification +from drama.helpers.discord import send_message +from drama.classes import * from .front import frontlist from flask import * from io import BytesIO -from ruqqus.__main__ import app, limiter, cache, db_session +from drama.__main__ import app, limiter, cache, db_session from PIL import Image as PILimage BAN_REASONS = ['', @@ -26,7 +26,7 @@ BAN_REASONS = ['', "Copyright infringement is not permitted." ] -BUCKET = "i.ruqqus.ga" +BUCKET = "i.drama.ga" with open("snappy.txt", "r") as f: snappyquotes = f.read().split("{[para]}") @@ -373,7 +373,7 @@ def thumbs(new_post): #iterate through desired meta tags meta_tags = [ - "ruqqus:thumbnail", + "drama:thumbnail", "twitter:image", "og:image", "thumbnail" @@ -944,7 +944,7 @@ def submit_post(v): name = f'post/{new_post.base36id}/{secrets.token_urlsafe(8)}' new_post.url = upload_file(name, file) - new_post.domain_ref = 1 # id of i.ruqqus.ga domain + new_post.domain_ref = 1 # id of i.drama.ga domain g.db.add(new_post) g.db.add(new_post.submission_aux) g.db.commit() diff --git a/ruqqus/routes/search.py b/drama/routes/search.py similarity index 98% rename from ruqqus/routes/search.py rename to drama/routes/search.py index dd8696fc7..4fbd17e79 100644 --- a/ruqqus/routes/search.py +++ b/drama/routes/search.py @@ -1,9 +1,9 @@ -from ruqqus.helpers.wrappers import * +from drama.helpers.wrappers import * import re from sqlalchemy import * from flask import * -from ruqqus.classes.domains import reasons as REASONS -from ruqqus.__main__ import app, cache +from drama.classes.domains import reasons as REASONS +from drama.__main__ import app, cache import random query_regex=re.compile("(\w+):(\S+)") diff --git a/ruqqus/routes/settings.py b/drama/routes/settings.py similarity index 98% rename from ruqqus/routes/settings.py rename to drama/routes/settings.py index 95f823438..1e5041f38 100644 --- a/ruqqus/routes/settings.py +++ b/drama/routes/settings.py @@ -1,12 +1,12 @@ from __future__ import unicode_literals -from ruqqus.helpers.alerts import * -from ruqqus.helpers.sanitize import * -from ruqqus.helpers.filters import filter_comment_html -from ruqqus.helpers.markdown import * -from ruqqus.helpers.discord import remove_user, set_nick -from ruqqus.mail import * +from drama.helpers.alerts import * +from drama.helpers.sanitize import * +from drama.helpers.filters import filter_comment_html +from drama.helpers.markdown import * +from drama.helpers.discord import remove_user, set_nick +from drama.mail import * from .front import frontlist -from ruqqus.__main__ import app, cache +from drama.__main__ import app, cache import youtube_dl valid_username_regex = re.compile("^[a-zA-Z0-9_\-]{3,25}$") diff --git a/ruqqus/routes/static.py b/drama/routes/static.py similarity index 98% rename from ruqqus/routes/static.py rename to drama/routes/static.py index ddf7d639b..076f05259 100644 --- a/ruqqus/routes/static.py +++ b/drama/routes/static.py @@ -1,6 +1,6 @@ -from ruqqus.mail import * -from ruqqus.__main__ import app, limiter -from ruqqus.helpers.alerts import * +from drama.mail import * +from drama.__main__ import app, limiter +from drama.helpers.alerts import * @app.route("/sex") def index(): diff --git a/ruqqus/routes/users.py b/drama/routes/users.py similarity index 98% rename from ruqqus/routes/users.py rename to drama/routes/users.py index c4092177d..533f0cf09 100644 --- a/ruqqus/routes/users.py +++ b/drama/routes/users.py @@ -2,12 +2,12 @@ import qrcode import io from datetime import datetime -from ruqqus.helpers.alerts import * -from ruqqus.helpers.sanitize import * -from ruqqus.helpers.markdown import * -from ruqqus.mail import * +from drama.helpers.alerts import * +from drama.helpers.sanitize import * +from drama.helpers.markdown import * +from drama.mail import * from flask import * -from ruqqus.__main__ import app, cache, limiter, db_session +from drama.__main__ import app, cache, limiter, db_session from pusher_push_notifications import PushNotifications PUSHER_KEY = environ.get("PUSHER_KEY", "").strip() diff --git a/ruqqus/routes/votes.py b/drama/routes/votes.py similarity index 95% rename from ruqqus/routes/votes.py rename to drama/routes/votes.py index 49b5d325b..e5d296a14 100644 --- a/ruqqus/routes/votes.py +++ b/drama/routes/votes.py @@ -1,8 +1,8 @@ -from ruqqus.helpers.wrappers import * -from ruqqus.helpers.get import * -from ruqqus.classes import * +from drama.helpers.wrappers import * +from drama.helpers.get import * +from drama.classes import * from flask import * -from ruqqus.__main__ import app +from drama.__main__ import app @app.route("/api/v1/vote/post//", methods=["POST"]) diff --git a/ruqqus/static/index.js b/drama/static/index.js similarity index 100% rename from ruqqus/static/index.js rename to drama/static/index.js diff --git a/ruqqus/templates/2fa_modal.html b/drama/templates/2fa_modal.html similarity index 100% rename from ruqqus/templates/2fa_modal.html rename to drama/templates/2fa_modal.html diff --git a/ruqqus/templates/admin/admin_home.html b/drama/templates/admin/admin_home.html similarity index 100% rename from ruqqus/templates/admin/admin_home.html rename to drama/templates/admin/admin_home.html diff --git a/ruqqus/templates/admin/alt_votes.html b/drama/templates/admin/alt_votes.html similarity index 100% rename from ruqqus/templates/admin/alt_votes.html rename to drama/templates/admin/alt_votes.html diff --git a/ruqqus/templates/admin/app.html b/drama/templates/admin/app.html similarity index 100% rename from ruqqus/templates/admin/app.html rename to drama/templates/admin/app.html diff --git a/ruqqus/templates/admin/app_data.html b/drama/templates/admin/app_data.html similarity index 100% rename from ruqqus/templates/admin/app_data.html rename to drama/templates/admin/app_data.html diff --git a/ruqqus/templates/admin/apps.html b/drama/templates/admin/apps.html similarity index 100% rename from ruqqus/templates/admin/apps.html rename to drama/templates/admin/apps.html diff --git a/ruqqus/templates/admin/badge_grant.html b/drama/templates/admin/badge_grant.html similarity index 100% rename from ruqqus/templates/admin/badge_grant.html rename to drama/templates/admin/badge_grant.html diff --git a/ruqqus/templates/admin/cache.html b/drama/templates/admin/cache.html similarity index 100% rename from ruqqus/templates/admin/cache.html rename to drama/templates/admin/cache.html diff --git a/ruqqus/templates/admin/content_stats.html b/drama/templates/admin/content_stats.html similarity index 100% rename from ruqqus/templates/admin/content_stats.html rename to drama/templates/admin/content_stats.html diff --git a/ruqqus/templates/admin/flagged_comments.html b/drama/templates/admin/flagged_comments.html similarity index 100% rename from ruqqus/templates/admin/flagged_comments.html rename to drama/templates/admin/flagged_comments.html diff --git a/ruqqus/templates/admin/flagged_posts.html b/drama/templates/admin/flagged_posts.html similarity index 100% rename from ruqqus/templates/admin/flagged_posts.html rename to drama/templates/admin/flagged_posts.html diff --git a/ruqqus/templates/admin/image_ban.html b/drama/templates/admin/image_ban.html similarity index 100% rename from ruqqus/templates/admin/image_ban.html rename to drama/templates/admin/image_ban.html diff --git a/ruqqus/templates/admin/image_posts.html b/drama/templates/admin/image_posts.html similarity index 100% rename from ruqqus/templates/admin/image_posts.html rename to drama/templates/admin/image_posts.html diff --git a/ruqqus/templates/admin/image_purge.html b/drama/templates/admin/image_purge.html similarity index 100% rename from ruqqus/templates/admin/image_purge.html rename to drama/templates/admin/image_purge.html diff --git a/ruqqus/templates/admin/manage_domain.html b/drama/templates/admin/manage_domain.html similarity index 100% rename from ruqqus/templates/admin/manage_domain.html rename to drama/templates/admin/manage_domain.html diff --git a/ruqqus/templates/admin/new_users.html b/drama/templates/admin/new_users.html similarity index 100% rename from ruqqus/templates/admin/new_users.html rename to drama/templates/admin/new_users.html diff --git a/ruqqus/templates/admin/removed_posts.html b/drama/templates/admin/removed_posts.html similarity index 100% rename from ruqqus/templates/admin/removed_posts.html rename to drama/templates/admin/removed_posts.html diff --git a/ruqqus/templates/admin/votes.html b/drama/templates/admin/votes.html similarity index 100% rename from ruqqus/templates/admin/votes.html rename to drama/templates/admin/votes.html diff --git a/ruqqus/templates/authforms.html b/drama/templates/authforms.html similarity index 100% rename from ruqqus/templates/authforms.html rename to drama/templates/authforms.html diff --git a/ruqqus/templates/badge.html b/drama/templates/badge.html similarity index 100% rename from ruqqus/templates/badge.html rename to drama/templates/badge.html diff --git a/ruqqus/templates/badge_pair.html b/drama/templates/badge_pair.html similarity index 100% rename from ruqqus/templates/badge_pair.html rename to drama/templates/badge_pair.html diff --git a/ruqqus/templates/badges.html b/drama/templates/badges.html similarity index 100% rename from ruqqus/templates/badges.html rename to drama/templates/badges.html diff --git a/ruqqus/templates/banned.html b/drama/templates/banned.html similarity index 100% rename from ruqqus/templates/banned.html rename to drama/templates/banned.html diff --git a/ruqqus/templates/blocks.html b/drama/templates/blocks.html similarity index 100% rename from ruqqus/templates/blocks.html rename to drama/templates/blocks.html diff --git a/ruqqus/templates/bootstrap.html b/drama/templates/bootstrap.html similarity index 100% rename from ruqqus/templates/bootstrap.html rename to drama/templates/bootstrap.html diff --git a/ruqqus/templates/changelog.html b/drama/templates/changelog.html similarity index 100% rename from ruqqus/templates/changelog.html rename to drama/templates/changelog.html diff --git a/ruqqus/templates/comment_failed.html b/drama/templates/comment_failed.html similarity index 100% rename from ruqqus/templates/comment_failed.html rename to drama/templates/comment_failed.html diff --git a/ruqqus/templates/comments.html b/drama/templates/comments.html similarity index 99% rename from ruqqus/templates/comments.html rename to drama/templates/comments.html index 41230ffc0..ee4f4c531 100644 --- a/ruqqus/templates/comments.html +++ b/drama/templates/comments.html @@ -451,7 +451,7 @@
  • Votes
    • - {% if v and v.id!=p.author_id %} + {% if v and v.id!=c.author_id %}
  • Ban user
    • {% endif %} diff --git a/ruqqus/templates/contact.html b/drama/templates/contact.html similarity index 100% rename from ruqqus/templates/contact.html rename to drama/templates/contact.html diff --git a/ruqqus/templates/control_panel_logged_in.html b/drama/templates/control_panel_logged_in.html similarity index 100% rename from ruqqus/templates/control_panel_logged_in.html rename to drama/templates/control_panel_logged_in.html diff --git a/ruqqus/templates/control_panel_logged_out.html b/drama/templates/control_panel_logged_out.html similarity index 100% rename from ruqqus/templates/control_panel_logged_out.html rename to drama/templates/control_panel_logged_out.html diff --git a/ruqqus/templates/default.html b/drama/templates/default.html similarity index 99% rename from ruqqus/templates/default.html rename to drama/templates/default.html index 1e30d1695..597f3ba0d 100644 --- a/ruqqus/templates/default.html +++ b/drama/templates/default.html @@ -787,13 +787,13 @@ - + - + - + diff --git a/ruqqus/templates/delete_comment_modal.html b/drama/templates/delete_comment_modal.html similarity index 100% rename from ruqqus/templates/delete_comment_modal.html rename to drama/templates/delete_comment_modal.html diff --git a/ruqqus/templates/delete_post_modal.html b/drama/templates/delete_post_modal.html similarity index 100% rename from ruqqus/templates/delete_post_modal.html rename to drama/templates/delete_post_modal.html diff --git a/ruqqus/templates/developers.html b/drama/templates/developers.html similarity index 96% rename from ruqqus/templates/developers.html rename to drama/templates/developers.html index 6b4441ac0..1c50a3a82 100644 --- a/ruqqus/templates/developers.html +++ b/drama/templates/developers.html @@ -37,7 +37,7 @@ Thumbnail images for posts are determined by using the first successful conditio ## Applications -To request ruqqus API keys, visit [this page](/apps) +To request drama API keys, visit [this page](/apps) {% endfilter %} {% endblock %} diff --git a/ruqqus/templates/email/2fa_remove.html b/drama/templates/email/2fa_remove.html similarity index 96% rename from ruqqus/templates/email/2fa_remove.html rename to drama/templates/email/2fa_remove.html index 0da9679a0..7441e5e14 100644 --- a/ruqqus/templates/email/2fa_remove.html +++ b/drama/templates/email/2fa_remove.html @@ -29,7 +29,7 @@

    If you have any questions, feel free to email the Drama team..

    Thanks,
    The Drama Team

    -

    P.S. Feel free to tweet at us on Twitter @ruqqus.

    +

    P.S. Feel free to tweet at us on Twitter @drama.

    diff --git a/ruqqus/templates/email/default.html b/drama/templates/email/default.html similarity index 100% rename from ruqqus/templates/email/default.html rename to drama/templates/email/default.html diff --git a/ruqqus/templates/email/email_change.html b/drama/templates/email/email_change.html similarity index 100% rename from ruqqus/templates/email/email_change.html rename to drama/templates/email/email_change.html diff --git a/ruqqus/templates/email/email_verify.html b/drama/templates/email/email_verify.html similarity index 100% rename from ruqqus/templates/email/email_verify.html rename to drama/templates/email/email_verify.html diff --git a/ruqqus/templates/email/password_reset.html b/drama/templates/email/password_reset.html similarity index 100% rename from ruqqus/templates/email/password_reset.html rename to drama/templates/email/password_reset.html diff --git a/ruqqus/templates/embeds/comment.html b/drama/templates/embeds/comment.html similarity index 100% rename from ruqqus/templates/embeds/comment.html rename to drama/templates/embeds/comment.html diff --git a/ruqqus/templates/embeds/comment_removed.html b/drama/templates/embeds/comment_removed.html similarity index 100% rename from ruqqus/templates/embeds/comment_removed.html rename to drama/templates/embeds/comment_removed.html diff --git a/ruqqus/templates/embeds/embed_default.html b/drama/templates/embeds/embed_default.html similarity index 100% rename from ruqqus/templates/embeds/embed_default.html rename to drama/templates/embeds/embed_default.html diff --git a/ruqqus/templates/embeds/submission.html b/drama/templates/embeds/submission.html similarity index 100% rename from ruqqus/templates/embeds/submission.html rename to drama/templates/embeds/submission.html diff --git a/ruqqus/templates/emoji_modal.html b/drama/templates/emoji_modal.html similarity index 100% rename from ruqqus/templates/emoji_modal.html rename to drama/templates/emoji_modal.html diff --git a/ruqqus/templates/errors/400.html b/drama/templates/errors/400.html similarity index 100% rename from ruqqus/templates/errors/400.html rename to drama/templates/errors/400.html diff --git a/ruqqus/templates/errors/401.html b/drama/templates/errors/401.html similarity index 100% rename from ruqqus/templates/errors/401.html rename to drama/templates/errors/401.html diff --git a/ruqqus/templates/errors/402.html b/drama/templates/errors/402.html similarity index 100% rename from ruqqus/templates/errors/402.html rename to drama/templates/errors/402.html diff --git a/ruqqus/templates/errors/403.html b/drama/templates/errors/403.html similarity index 100% rename from ruqqus/templates/errors/403.html rename to drama/templates/errors/403.html diff --git a/ruqqus/templates/errors/404.html b/drama/templates/errors/404.html similarity index 100% rename from ruqqus/templates/errors/404.html rename to drama/templates/errors/404.html diff --git a/ruqqus/templates/errors/405.html b/drama/templates/errors/405.html similarity index 100% rename from ruqqus/templates/errors/405.html rename to drama/templates/errors/405.html diff --git a/ruqqus/templates/errors/409.html b/drama/templates/errors/409.html similarity index 100% rename from ruqqus/templates/errors/409.html rename to drama/templates/errors/409.html diff --git a/ruqqus/templates/errors/410.html b/drama/templates/errors/410.html similarity index 100% rename from ruqqus/templates/errors/410.html rename to drama/templates/errors/410.html diff --git a/ruqqus/templates/errors/413.html b/drama/templates/errors/413.html similarity index 100% rename from ruqqus/templates/errors/413.html rename to drama/templates/errors/413.html diff --git a/ruqqus/templates/errors/418.html b/drama/templates/errors/418.html similarity index 100% rename from ruqqus/templates/errors/418.html rename to drama/templates/errors/418.html diff --git a/ruqqus/templates/errors/422.html b/drama/templates/errors/422.html similarity index 100% rename from ruqqus/templates/errors/422.html rename to drama/templates/errors/422.html diff --git a/ruqqus/templates/errors/429.html b/drama/templates/errors/429.html similarity index 100% rename from ruqqus/templates/errors/429.html rename to drama/templates/errors/429.html diff --git a/ruqqus/templates/errors/451.html b/drama/templates/errors/451.html similarity index 100% rename from ruqqus/templates/errors/451.html rename to drama/templates/errors/451.html diff --git a/ruqqus/templates/errors/500.html b/drama/templates/errors/500.html similarity index 100% rename from ruqqus/templates/errors/500.html rename to drama/templates/errors/500.html diff --git a/ruqqus/templates/errors/502.html b/drama/templates/errors/502.html similarity index 100% rename from ruqqus/templates/errors/502.html rename to drama/templates/errors/502.html diff --git a/ruqqus/templates/errors/503.html b/drama/templates/errors/503.html similarity index 98% rename from ruqqus/templates/errors/503.html rename to drama/templates/errors/503.html index 57c75e8a8..5b192d30d 100644 --- a/ruqqus/templates/errors/503.html +++ b/drama/templates/errors/503.html @@ -43,7 +43,7 @@