diff --git a/files/__main__.py b/files/__main__.py index 6cea565be..8bf12bae8 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -14,7 +14,7 @@ from flask_limiter import Limiter from sqlalchemy import * from sqlalchemy.orm import scoped_session, sessionmaker -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.const_stateful import const_initialize from files.helpers.settings import reload_settings, start_watching_settings diff --git a/files/assets/css/main.css b/files/assets/css/main.css index b989b337f..eeac3cf8d 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -6458,6 +6458,10 @@ div.markdown { } } +.sub-banner-update-section .sub-settings-subsection { + margin-bottom: 1em; +} + .resizable { resize:both; display:inline-block; diff --git a/files/classes/__init__.py b/files/classes/__init__.py index 85fd12f5e..b45bb888c 100644 --- a/files/classes/__init__.py +++ b/files/classes/__init__.py @@ -3,7 +3,7 @@ from sqlalchemy.ext.declarative import declarative_base Base = declarative_base() # then load our required constants... -from files.helpers.const import FEATURES, KOFI_TOKEN +from files.helpers.config.const import FEATURES, KOFI_TOKEN # then load all of our classes :) from .alts import * diff --git a/files/classes/award.py b/files/classes/award.py index 7ae1228ee..534157014 100644 --- a/files/classes/award.py +++ b/files/classes/award.py @@ -5,7 +5,7 @@ from sqlalchemy.orm import relationship from sqlalchemy.sql.sqltypes import * from files.classes import Base -from files.helpers.const import AWARDS, HOUSE_AWARDS +from files.helpers.config.awards import AWARDS, HOUSE_AWARDS from files.helpers.lazy import lazy diff --git a/files/classes/badges.py b/files/classes/badges.py index 232643e63..841661616 100644 --- a/files/classes/badges.py +++ b/files/classes/badges.py @@ -5,7 +5,7 @@ from sqlalchemy.orm import relationship from sqlalchemy.sql.sqltypes import * from files.classes import Base -from files.helpers.const import SITE_NAME +from files.helpers.config.const import SITE_NAME from files.helpers.lazy import lazy class BadgeDef(Base): diff --git a/files/classes/clients.py b/files/classes/clients.py index b2bb6c106..9bcac0848 100644 --- a/files/classes/clients.py +++ b/files/classes/clients.py @@ -5,7 +5,7 @@ from sqlalchemy.orm import relationship, scoped_session from sqlalchemy.sql.sqltypes import * from files.classes import Base -from files.helpers.const import SITE_FULL +from files.helpers.config.const import SITE_FULL from files.helpers.lazy import lazy from .comment import Comment diff --git a/files/classes/comment.py b/files/classes/comment.py index d11de0084..7b82037fe 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -10,7 +10,7 @@ from sqlalchemy.schema import FetchedValue from sqlalchemy.sql.sqltypes import * from files.classes import Base -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.lazy import lazy from files.helpers.regex import * from files.helpers.sorting_and_time import * diff --git a/files/classes/leaderboard.py b/files/classes/leaderboard.py index b536f92c3..b948ff479 100644 --- a/files/classes/leaderboard.py +++ b/files/classes/leaderboard.py @@ -3,7 +3,7 @@ from typing import Any, Callable, Optional, Tuple, Union from sqlalchemy import Column, func from sqlalchemy.orm import scoped_session -from files.helpers.const import LEADERBOARD_LIMIT +from files.helpers.config.const import LEADERBOARD_LIMIT from .badges import Badge from .marsey import Marsey diff --git a/files/classes/lottery.py b/files/classes/lottery.py index 496e71b74..abde47b0b 100644 --- a/files/classes/lottery.py +++ b/files/classes/lottery.py @@ -4,7 +4,7 @@ from sqlalchemy import Column, ForeignKey from sqlalchemy.sql.sqltypes import * from files.classes import Base -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.lazy import lazy class Lottery(Base): diff --git a/files/classes/mod_logs.py b/files/classes/mod_logs.py index bdc7fe068..8cc873f78 100644 --- a/files/classes/mod_logs.py +++ b/files/classes/mod_logs.py @@ -1,12 +1,11 @@ import time -from copy import deepcopy from sqlalchemy import Column, ForeignKey from sqlalchemy.orm import relationship from sqlalchemy.sql.sqltypes import * from files.classes import Base -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.lazy import lazy from files.helpers.regex import censor_slurs from files.helpers.sorting_and_time import make_age_string @@ -50,7 +49,7 @@ class ModAction(Base): @property @lazy def string(self): - output = ACTIONTYPES[self.kind]["str"].format(self=self) + output = MODACTION_TYPES[self.kind]["str"].format(self=self) if self.note: output += f" ({self.note})" return output @@ -65,356 +64,16 @@ class ModAction(Base): @property @lazy def icon(self): - return ACTIONTYPES[self.kind]['icon'] + return MODACTION_TYPES[self.kind]['icon'] @property @lazy def color(self): - return ACTIONTYPES[self.kind]['color'] + return MODACTION_TYPES[self.kind]['color'] @property @lazy def permalink(self): return f"{SITE_FULL}/log/{self.id}" -ACTIONTYPES = { - 'chud': { - "str": 'chudded {self.target_link}', - "icon": 'fa-snooze', - "color": 'bg-danger' - }, - 'approve_app': { - "str": 'approved an application by {self.target_link}', - "icon": 'fa-robot', - "color": 'bg-success' - }, - 'badge_grant': { - "str": 'granted badge to {self.target_link}', - "icon": 'fa-badge', - "color": 'bg-success' - }, - 'badge_remove': { - "str": 'removed badge from {self.target_link}', - "icon": 'fa-badge', - "color": 'bg-danger' - }, - 'ban_comment': { - "str": 'removed {self.target_link}', - "icon": 'fa-comment', - "color": 'bg-danger' - }, - 'ban_domain': { - "str": 'banned a domain', - "icon": 'fa-globe', - "color": 'bg-danger' - }, - 'ban_post': { - "str": 'removed post {self.target_link}', - "icon": 'fa-feather-alt', - "color": 'bg-danger' - }, - 'ban_user': { - "str": 'banned user {self.target_link}', - "icon": 'fa-user-slash', - "color": 'bg-danger' - }, - 'delete_report': { - "str": 'deleted report on {self.target_link}', - "icon": 'fa-flag', - "color": 'bg-danger' - }, - 'disable_bots': { - "str": 'disabled bots', - "icon": 'fa-robot', - "color": 'bg-danger' - }, - 'disable_fart_mode': { - "str": 'disabled fart mode', - "icon": 'fa-gas-pump-slash', - "color": 'bg-danger' - }, - 'disable_read_only_mode': { - "str": 'disabled read only mode', - "icon": 'fa-book', - "color": 'bg-danger' - }, - 'disable_signups': { - "str": 'disabled signups', - "icon": 'fa-users', - "color": 'bg-danger' - }, - 'disable_login_required': { - "str": 'disabled login required', - "icon": 'fa-users', - "color": 'bg-danger' - }, - 'disable_under_attack': { - "str": 'disabled under attack mode', - "icon": 'fa-shield', - "color": 'bg-muted' - }, - 'disable_under_siege': { - "str": 'disabled under siege mode', - "icon": 'fa-shield', - "color": 'bg-muted' - }, - 'distinguish_comment': { - "str": 'distinguished {self.target_link}', - "icon": 'fa-crown', - "color": 'bg-success' - }, - 'distinguish_post': { - "str": 'distinguished {self.target_link}', - "icon": 'fa-crown', - "color": 'bg-success' - }, - 'distribute': { - "str": 'distributed bet winnings to voters on {self.target_link}', - "icon": 'fa-dollar-sign', - "color": 'bg-success' - }, - 'clear_internal_cache': { - "str": 'cleared internal cache', - "icon": 'fa-trash-alt', - "color": 'bg-muted' - }, - 'edit_post': { - "str": 'edited {self.target_link}', - "icon": 'fa-edit', - "color": 'bg-primary' - }, - 'edit_rules': { - "str": 'edited the rules', - "icon": 'fa-columns', - "color": 'bg-primary' - }, - 'enable_bots': { - "str": 'enabled bots', - "icon": 'fa-robot', - "color": 'bg-success' - }, - 'enable_fart_mode': { - "str": 'enabled fart mode', - "icon": 'fa-gas-pump', - "color": 'bg-success' - }, - 'enable_read_only_mode': { - "str": 'enabled read only mode', - "icon": 'fa-book', - "color": 'bg-success' - }, - 'enable_signups': { - "str": 'enabled signups', - "icon": 'fa-users', - "color": 'bg-success' - }, - 'enable_login_required': { - "str": 'enabled login required', - "icon": 'fa-users', - "color": 'bg-success' - }, - 'enable_under_attack': { - "str": 'enabled under attack mode', - "icon": 'fa-shield', - "color": 'bg-success' - }, - 'enable_under_siege': { - "str": 'enabled under siege mode', - "icon": 'fa-shield', - "color": 'bg-success', - }, - 'flair_post': { - "str": 'set a flair on {self.target_link}', - "icon": 'fa-tag', - "color": 'bg-primary' - }, - 'link_accounts': { - "str": 'linked {self.target_link}', - "icon": 'fa-link', - "color": 'bg-success' - }, - 'delink_accounts': { - "str": 'delinked {self.target_link}', - "icon": 'fa-link-slash', - "color": 'bg-danger' - }, - 'make_admin': { - "str": 'made {self.target_link} an admin', - "icon": 'fa-user-crown', - "color": 'bg-success' - }, - 'mod_mute_user': { - "str": 'muted reports from user {self.target_link}', - "icon": 'fa-file-signature', - "color": 'bg-danger' - }, - 'mod_unmute_user': { - "str": 'unmuted reports from user {self.target_link}', - "icon": 'fa-file-signature', - "color": 'bg-success' - }, - 'monthly': { - "str": 'distributed monthly marseybux', - "icon": 'fa-sack-dollar', - "color": 'bg-success' - }, - 'move_hole': { - "str": 'changed hole of {self.target_link}', - "icon": 'fa-manhole', - "color": 'bg-primary' - }, - 'nuke_user': { - "str": 'removed all content of {self.target_link}', - "icon": 'fa-radiation-alt', - "color": 'bg-danger' - }, - 'pin_comment': { - "str": 'pinned {self.target_link}', - "icon": 'fa-thumbtack fa-rotate--45', - "color": 'bg-success' - }, - 'pin_post': { - "str": 'pinned post {self.target_link}', - "icon": 'fa-thumbtack fa-rotate--45', - "color": 'bg-success' - }, - 'clear_cloudflare_cache': { - "str": 'cleared cloudflare cache', - "icon": 'fab fa-cloudflare', - "color": 'bg-muted' - }, - 'reject_app': { - "str": 'rejected an application request by {self.target_link}', - "icon": 'fa-robot', - "color": 'bg-muted' - }, - 'remove_admin': { - "str": 'removed {self.target_link} as admin', - "icon": 'fa-user-crown', - "color": 'bg-danger' - }, - 'revert': { - "str": 'reverted {self.target_link} mod actions', - "icon": 'fa-history', - "color": 'bg-danger' - }, - 'revoke_app': { - "str": 'revoked an application by {self.target_link}', - "icon": 'fa-robot', - "color": 'bg-muted' - }, - 'set_flair_locked': { - "str": "set {self.target_link}'s flair (locked)", - "icon": 'fa-award', - "color": 'bg-primary' - }, - 'set_flair_notlocked': { - "str": "set {self.target_link}'s flair (not locked)", - "icon": 'fa-award', - "color": 'bg-primary' - }, - 'set_new': { - "str": 'changed the default sorting of comments on {self.target_link} to `new`', - "icon": 'fa-sparkles', - "color": 'bg-primary' - }, - 'set_hot': { - "str": 'changed the default sorting of comments on {self.target_link} to `hot`', - "icon": 'fa-fire', - "color": 'bg-primary' - }, - 'set_nsfw': { - "str": 'set {self.target_link} as +18', - "icon": 'fa-eye-evil', - "color": 'bg-danger' - }, - 'set_nsfw_comment': { - "str": 'set {self.target_link} as +18', - "icon": 'fa-eye-evil', - "color": 'bg-danger' - }, - 'shadowban': { - "str": 'shadowbanned {self.target_link}', - "icon": 'fa-eye-slash', - "color": 'bg-danger' - }, - 'unchud': { - "str": 'unchudded {self.target_link}', - "icon": 'fa-snooze', - "color": 'bg-success' - }, - 'unban_comment': { - "str": 'reinstated {self.target_link}', - "icon": 'fa-comment', - "color": 'bg-success' - }, - 'unban_domain': { - "str": 'unbanned a domain', - "icon": 'fa-globe', - "color": 'bg-success' - }, - 'unban_post': { - "str": 'reinstated post {self.target_link}', - "icon": 'fa-feather-alt', - "color": 'bg-success' - }, - 'unban_user': { - "str": 'unbanned user {self.target_link}', - "icon": 'fa-user', - "color": 'bg-success' - }, - 'undistinguish_comment': { - "str": 'un-distinguished {self.target_link}', - "icon": 'fa-crown', - "color": 'bg-muted' - }, - 'undistinguish_post': { - "str": 'un-distinguished {self.target_link}', - "icon": 'fa-crown', - "color": 'bg-muted' - }, - 'unnuke_user': { - "str": 'approved all content of {self.target_link}', - "icon": 'fa-radiation-alt', - "color": 'bg-success' - }, - 'unpin_comment': { - "str": 'unpinned {self.target_link}', - "icon": 'fa-thumbtack fa-rotate--45', - "color": 'bg-muted' - }, - 'unpin_post': { - "str": 'unpinned post {self.target_link}', - "icon": 'fa-thumbtack fa-rotate--45', - "color": 'bg-muted' - }, - 'unset_nsfw': { - "str": 'unset {self.target_link} as +18', - "icon": 'fa-eye-evil', - "color": 'bg-success' - }, - 'unset_nsfw_comment': { - "str": 'unset {self.target_link} as +18', - "icon": 'fa-eye-evil', - "color": 'bg-success' - }, - 'unshadowban': { - "str": 'unshadowbanned {self.target_link}', - "icon": 'fa-eye', - "color": 'bg-success' - }, - 'update_hat': { - "str": 'updated hat image', - "icon": 'fa-hat-cowboy', - "color": 'bg-success' - }, - 'update_marsey': { - "str": 'updated marsey', - "icon": 'fa-cat', - "color": 'bg-success' - }, -} - -ACTIONTYPES2 = deepcopy(ACTIONTYPES) -ACTIONTYPES2.pop("shadowban") -ACTIONTYPES2.pop("unshadowban") +from files.helpers.config.modaction_types import MODACTION_TYPES, MODACTION_TYPES_FILTERED diff --git a/files/classes/sub.py b/files/classes/sub.py index 495a2fb58..783eacca6 100644 --- a/files/classes/sub.py +++ b/files/classes/sub.py @@ -1,25 +1,28 @@ +from random import Random import time -from os import environ +from typing import Optional from sqlalchemy import Column +from sqlalchemy.ext.mutable import MutableList from sqlalchemy.orm import relationship -from sqlalchemy.sql.sqltypes import * +from sqlalchemy.types import VARCHAR, Boolean, Integer +from sqlalchemy.dialects.postgresql import ARRAY from files.classes import Base from files.helpers.lazy import lazy -from files.helpers.const import * +from files.helpers.config.const import * from .sub_relationship import * class Sub(Base): __tablename__ = "subs" - name = Column(String, primary_key=True) - sidebar = Column(String) - sidebar_html = Column(String) - sidebarurl = Column(String) - bannerurl = Column(String) - marseyurl = Column(String) - css = Column(String) + name = Column(VARCHAR(SUB_NAME_COLUMN_LENGTH), primary_key=True) + sidebar = Column(VARCHAR(SUB_SIDEBAR_COLUMN_LENGTH)) + sidebar_html = Column(VARCHAR(SUB_SIDEBAR_HTML_COLUMN_LENGTH)) + sidebarurl = Column(VARCHAR(SUB_SIDEBAR_URL_COLUMN_LENGTH)) + bannerurls = Column(MutableList.as_mutable(ARRAY(VARCHAR(SUB_BANNER_URL_COLUMN_LENGTH))), default=MutableList([]), nullable=False) + marseyurl = Column(VARCHAR(SUB_MARSEY_URL_LENGTH)) + css = Column(VARCHAR(SUB_CSS_COLUMN_LENGTH)) stealth = Column(Boolean) created_utc = Column(Integer) @@ -42,9 +45,20 @@ class Sub(Base): @property @lazy - def banner_url(self): - if self.bannerurl: return SITE_FULL + self.bannerurl - return f'/i/{SITE_NAME}/banner.webp?v=3009' + def banner_urls(self): + if self.bannerurls: return [f"{SITE_FULL}{banner}" for banner in self.bannerurls] + return [] + + @lazy + def random_banner(self, random:Optional[Random]=None): + if not self.banner_urls: return None + if not random: random = Random() + return random.choice(self.banner_urls) + + @property + @lazy + def has_banners(self) -> bool: + return bool(self.bannerurls) @property @lazy diff --git a/files/classes/sub_logs.py b/files/classes/sub_logs.py index 6ed27e9de..2aaca98fe 100644 --- a/files/classes/sub_logs.py +++ b/files/classes/sub_logs.py @@ -5,7 +5,7 @@ from sqlalchemy.orm import relationship from sqlalchemy.sql.sqltypes import * from files.classes import Base -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.lazy import lazy from files.helpers.regex import censor_slurs from files.helpers.sorting_and_time import make_age_string @@ -41,7 +41,7 @@ class SubAction(Base): @property @lazy def string(self): - output = ACTIONTYPES[self.kind]["str"].format(self=self) + output = SUBACTION_TYPES[self.kind]["str"].format(self=self) if self._note: output += f" ({self._note})" return output @@ -56,127 +56,16 @@ class SubAction(Base): @property @lazy def icon(self): - return ACTIONTYPES[self.kind]['icon'] + return SUBACTION_TYPES[self.kind]['icon'] @property @lazy def color(self): - return ACTIONTYPES[self.kind]['color'] + return SUBACTION_TYPES[self.kind]['color'] @property @lazy def permalink(self): return f"{SITE_FULL}/h/{self.sub}/log/{self.id}" -ACTIONTYPES = { - 'exile_user': { - "str": 'exiled user {self.target_link}', - "icon": 'fa-user-slash', - "color": 'bg-danger' - }, - 'unexile_user': { - "str": 'unexiled user {self.target_link}', - "icon": 'fa-user', - "color": 'bg-success' - }, - 'make_mod': { - "str": 'made {self.target_link} a mod', - "icon": 'fa-user-crown', - "color": 'bg-success' - }, - 'remove_mod': { - "str": 'removed {self.target_link} as mod', - "icon": 'fa-user-crown', - "color": 'bg-danger' - }, - 'kick_post': { - "str": 'kicked post {self.target_link}', - "icon": 'fa-feather-alt', - "color": 'bg-danger' - }, - 'move_chudrama': { - "str": 'moved post {self.target_link} to /h/chudrama', - "icon": 'fa-feather-alt', - "color": 'bg-danger' - }, - 'flair_post': { - "str": 'set a flair on {self.target_link}', - "icon": 'fa-tag', - "color": 'bg-primary' - }, - 'edit_sidebar': { - "str": 'edited the sidebar', - "icon": 'fa-columns', - "color": 'bg-primary' - }, - 'edit_css': { - "str": 'edited the css', - "icon": 'fa-css3-alt', - "color": 'bg-primary' - }, - 'change_banner': { - "str": 'changed the banner', - "icon": 'fa-landscape', - "color": 'bg-primary' - }, - 'change_sidebar_image': { - "str": 'changed the sidebar image', - "icon": 'fa-image', - "color": 'bg-primary' - }, - 'change_marsey': { - "str": 'changed the hole marsey', - "icon": 'fa-cat', - "color": 'bg-primary' - }, - 'pin_post': { - "str": 'pinned post {self.target_link}', - "icon": 'fa-thumbtack fa-rotate--45', - "color": 'bg-success' - }, - 'unpin_post': { - "str": 'unpinned post {self.target_link}', - "icon": 'fa-thumbtack fa-rotate--45', - "color": 'bg-muted' - }, - 'pin_comment': { - "str": 'pinned {self.target_link}', - "icon": 'fa-thumbtack fa-rotate--45', - "color": 'bg-success' - }, - 'unpin_comment': { - "str": 'unpinned {self.target_link}', - "icon": 'fa-thumbtack fa-rotate--45', - "color": 'bg-muted' - }, - 'enable_stealth': { - "str": 'enabled stealth mode', - "icon": 'fa-user-ninja', - "color": 'bg-primary' - }, - 'disable_stealth': { - "str": 'disabled stealth mode', - "icon": 'fa-user-ninja', - "color": 'bg-muted' - }, - 'set_nsfw': { - "str": 'set nsfw on post {self.target_link}', - "icon": 'fa-eye-evil', - "color": 'bg-danger' - }, - 'unset_nsfw': { - "str": 'un-set nsfw on post {self.target_link}', - "icon": 'fa-eye-evil', - "color": 'bg-success' - }, - 'set_nsfw_comment': { - "str": 'set nsfw on a {self.target_link}', - "icon": 'fa-eye-evil', - "color": 'bg-danger' - }, - 'unset_nsfw_comment': { - "str": 'un-set nsfw on a {self.target_link}', - "icon": 'fa-eye-evil', - "color": 'bg-success' - }, -} +from files.helpers.config.subaction_types import SUBACTION_TYPES diff --git a/files/classes/submission.py b/files/classes/submission.py index d21933de0..8f6ae788a 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -7,7 +7,7 @@ from sqlalchemy.orm import deferred, relationship, scoped_session from sqlalchemy.sql.sqltypes import * from files.classes import Base -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.lazy import lazy from files.helpers.regex import * from files.helpers.sorting_and_time import make_age_string diff --git a/files/classes/user.py b/files/classes/user.py index dda195ad4..78074d1a6 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -6,13 +6,14 @@ import pyotp from sqlalchemy import Column, ForeignKey from sqlalchemy.orm import aliased, deferred from sqlalchemy.sql import func -from sqlalchemy.sql.expression import not_, and_, or_, ColumnOperators +from sqlalchemy.sql.expression import not_, and_, or_ from sqlalchemy.sql.sqltypes import * from files.classes import Base from files.classes.casino_game import Casino_Game from files.classes.sub import Sub -from files.helpers.const import * +from files.helpers.config.const import * +from files.helpers.config.awards import AWARDS_ENABLED, HOUSE_AWARDS from files.helpers.media import * from files.helpers.security import * from files.helpers.sorting_and_time import * @@ -421,7 +422,7 @@ class User(Base): @property @lazy def user_awards(self): - return_value = list(AWARDS2.values()) + return_value = list(AWARDS_ENABLED.values()) if self.house: return_value.append(HOUSE_AWARDS[self.house]) diff --git a/files/events/__init__.py b/files/events/__init__.py index 71d2ada39..10402b802 100644 --- a/files/events/__init__.py +++ b/files/events/__init__.py @@ -1,6 +1,6 @@ from sqlalchemy import inspect -from files.helpers.const import AWARDS2, AWARDS_DISABLED +from files.helpers.config.awards import AWARDS_ENABLED, AWARDS_DISABLED from files.__main__ import engine from files.events.classes import * @@ -13,10 +13,10 @@ def _build_table(): EventUser.__table__.create(bind=engine, checkfirst=True) def _populate_awards(): - temp = {x: AWARDS2[x] for x in AWARDS2 if x not in EVENT_AWARDS} - AWARDS2.clear() - AWARDS2.update(EVENT_AWARDS) - AWARDS2.update(temp) + temp = {x: AWARDS_ENABLED[x] for x in AWARDS_ENABLED if x not in EVENT_AWARDS} + AWARDS_ENABLED.clear() + AWARDS_ENABLED.update(EVENT_AWARDS) + AWARDS_ENABLED.update(temp) for award in EVENT_AWARDS: if award in AWARDS_DISABLED: diff --git a/files/events/helpers/__init__.py b/files/events/helpers/__init__.py index 3651c2473..47714a266 100644 --- a/files/events/helpers/__init__.py +++ b/files/events/helpers/__init__.py @@ -1,2 +1,2 @@ -from .const import * +from .config.const import * from .jinja import * diff --git a/files/helpers/actions.py b/files/helpers/actions.py index 9dbe4bb43..864c66da5 100644 --- a/files/helpers/actions.py +++ b/files/helpers/actions.py @@ -12,7 +12,7 @@ from files.classes.notifications import Notification from files.classes.polls import CommentOption, SubmissionOption from files.helpers.alerts import send_repeatable_notification -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.const_stateful import * from files.helpers.discord import discord_message_send from files.helpers.get import * diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index 4d54b081b..4cf26b6a7 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -7,7 +7,7 @@ from pywebpush import webpush from files.classes import Comment, Notification, PushSubscription -from .const import * +from .config.const import * from .regex import * from .sanitize import * diff --git a/files/helpers/assetcache.py b/files/helpers/assetcache.py index 8a39c7166..2c9e4f6c1 100644 --- a/files/helpers/assetcache.py +++ b/files/helpers/assetcache.py @@ -5,7 +5,7 @@ from collections import defaultdict import gevent import gevent_inotifyx as inotify -from files.helpers.const import HOLIDAY_EVENT +from files.helpers.config.const import HOLIDAY_EVENT ASSET_DIR = 'files/assets' ASSET_SUBDIRS = ['/css', '/js', '/js/vendor'] diff --git a/files/helpers/awards.py b/files/helpers/awards.py index 543f57756..ab51e446a 100644 --- a/files/helpers/awards.py +++ b/files/helpers/awards.py @@ -4,7 +4,7 @@ from flask import g from files.classes.user import User from files.helpers.alerts import send_repeatable_notification -from files.helpers.const import bots, patron, SITE_NAME +from files.helpers.config.const import bots, patron, SITE_NAME def award_timers(v, bot=False): now = time.time() diff --git a/files/helpers/casino.py b/files/helpers/casino.py index 92441e784..041f4509c 100644 --- a/files/helpers/casino.py +++ b/files/helpers/casino.py @@ -1,7 +1,7 @@ import time from files.classes.casino_game import Casino_Game from files.helpers.alerts import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.useractions import badge_grant def get_game_feed(game, db): diff --git a/files/helpers/cloudflare.py b/files/helpers/cloudflare.py index 135a68697..ed6bfd351 100644 --- a/files/helpers/cloudflare.py +++ b/files/helpers/cloudflare.py @@ -3,7 +3,7 @@ from typing import List, Optional, Union import requests -from files.helpers.const import CF_HEADERS, CF_ZONE, DEFAULT_CONFIG_VALUE +from files.helpers.config.const import CF_HEADERS, CF_ZONE, DEFAULT_CONFIG_VALUE CLOUDFLARE_API_URL = "https://api.cloudflare.com/client/v4" CLOUDFLARE_REQUEST_TIMEOUT_SECS = 5 diff --git a/files/helpers/config/awards.py b/files/helpers/config/awards.py new file mode 100644 index 000000000..39843dcd1 --- /dev/null +++ b/files/helpers/config/awards.py @@ -0,0 +1,745 @@ +from copy import deepcopy + +from files.helpers.config.const import FEATURES, SITE_NAME, patron + +AWARDS = { + "fallback": { + "kind": "fallback", + "title": "Unknown", + "description": "", + "icon": "fas fa-block-question", + "color": "text-white", + "price": 0, + "deflectable": False, + "cosmetic": False + }, + ### Deprecated + "ghost": { + "kind": "ghost", + "title": "Ghost", + "description": "", + "icon": "fas fa-ghost", + "color": "text-white", + "price": 3000, + "deflectable": False, + "cosmetic": False + }, + "nword": { + "kind": "nword", + "title": "Nword Pass", + "description": "", + "icon": "fas fa-edit", + "color": "text-success", + "price": 10000, + "deflectable": True, + "cosmetic": False + }, + ### Fistmas 2021 + "snow": { + "kind": "snow", + "title": "Snow", + "description": "", + "icon": "fas fa-snowflake", + "color": "text-blue-200", + "price": 300, + "deflectable": False, + "cosmetic": True + }, + "gingerbread": { + "kind": "gingerbread", + "title": "Gingerbread", + "description": "", + "icon": "fas fa-gingerbread-man", + "color": "", + "price": 300, + "deflectable": False, + "cosmetic": True + }, + "lights": { + "kind": "lights", + "title": "Lights", + "description": "", + "icon": "fas fa-lights-holiday", + "color": "", + "price": 300, + "deflectable": False, + "cosmetic": True + }, + "candycane": { + "kind": "candycane", + "title": "Candy Cane", + "description": "", + "icon": "fas fa-candy-cane", + "color": "", + "price": 400, + "deflectable": False, + "cosmetic": True + }, + "fireplace": { + "kind": "fireplace", + "title": "Fireplace", + "description": "", + "icon": "fas fa-fireplace", + "color": "", + "price": 600, + "deflectable": False, + "cosmetic": True + }, + "grinch": { + "kind": "grinch", + "title": "Grinch", + "description": "", + "icon": "fas fa-angry", + "color": "text-green-500", + "price": 1000, + "deflectable": True, + "cosmetic": False + }, + ### Homoween 2021 & 2022 + "haunt": { + "kind": "haunt", + "title": "Haunt", + "description": "", + "icon": "fas fa-book-dead", + "color": "text-warning", + "price": 500, + "deflectable": False, + "cosmetic": True + }, + "upsidedown": { + "kind": "upsidedown", + "title": "The Upside Down", + "description": "", + "icon": "fas fa-lights-holiday", + "color": "", + "price": 400, + "deflectable": False, + "cosmetic": True + }, + "stab": { + "kind": "stab", + "title": "Stab", + "description": "", + "icon": "fas fa-knife-kitchen", + "color": "text-danger", + "price": 300, + "deflectable": False, + "cosmetic": True + }, + "spiders": { + "kind": "spiders", + "title": "Spiders", + "description": "", + "icon": "fas fa-spider", + "color": "text-black", + "price": 200, + "deflectable": False, + "cosmetic": True + }, + "fog": { + "kind": "fog", + "title": "Fog", + "description": "", + "icon": "fas fa-smoke", + "color": "text-gray", + "price": 200, + "deflectable": False, + "cosmetic": True + }, + ### Homoween 2022 + "jumpscare": { + "kind": "jumpscare", + "title": "Jumpscare", + "description": "", + "icon": "fas fa-coffin-cross", + "color": "text-purple", + "price": 600, + "deflectable": True, + "cosmetic": False + }, + "hw-bite": { + "kind": "hw-bite", + "title": "Zombie Bite", + "description": "", + "icon": "fas fa-biohazard", + "color": "text-danger", + "price": 500, + "deflectable": True, + "cosmetic": False + }, + "hw-vax": { + "kind": "hw-vax", + "title": "Vaxxmaxx", + "description": "", + "icon": "fas fa-syringe", + "color": "text-blue", + "price": 500, + "deflectable": True, + "cosmetic": False + }, + "hw-grinch": { + "kind": "hw-grinch", + "title": "Hallowgrinch", + "description": "", + "icon": "fas fa-angry", + "color": "text-orange", + "price": 1000, + "deflectable": True, + "cosmetic": False + }, + "flashlight": { + "kind": "flashlight", + "title": "Flashlight", + "description": "", + "icon": "fas fa-flashlight", + "color": "text-black", + "price": 400, + "deflectable": False, + "cosmetic": True + }, + "candy-corn": { + "kind": "candy-corn", + "title": "Candy Corn", + "description": "", + "icon": "fas fa-candy-corn", + "color": "text-orange", + "price": 400, + "deflectable": False, + "cosmetic": True + }, + "ectoplasm": { + "kind": "ectoplasm", + "title": "Ectoplasm", + "description": "", + "icon": "fas fa-ghost", + "color": "text-success", + "price": 400, + "deflectable": False, + "cosmetic": True + }, + "bones": { + "kind": "bones", + "title": "Bones", + "description": "", + "icon": "fas fa-bone", + "color": "text-white", + "price": 200, + "deflectable": False, + "cosmetic": True + }, + "pumpkin": { + "kind": "pumpkin", + "title": "Pumpkin", + "description": "", + "icon": "fas fa-jack-o-lantern", + "color": "text-orange", + "price": 200, + "deflectable": False, + "cosmetic": True + }, + ### Standard + "marsify": { + "kind": "marsify", + "title": "Marsify", + "description": "Marsifies the recipient's comments for 24 hours.", + "icon": "fas fa-cat", + "color": "text-white", + "price": 150, + "deflectable": True, + "cosmetic": False + }, + "shit": { + "kind": "shit", + "title": "Shit", + "description": "Makes flies swarm the post.", + "icon": "fas fa-poop", + "color": "text-black-50", + "price": 150, + "deflectable": False, + "cosmetic": True + }, + "fireflies": { + "kind": "fireflies", + "title": "Fireflies", + "description": "Makes fireflies swarm the post.", + "icon": "fas fa-sparkles", + "color": "text-warning", + "price": 150, + "deflectable": False, + "cosmetic": True + }, + "train": { + "kind": "train", + "title": "Train", + "description": "Summons a train on the post.", + "icon": "fas fa-train", + "color": "text-pink", + "price": 150, + "deflectable": False, + "cosmetic": True + }, + "scooter": { + "kind": "scooter", + "title": "Scooter", + "description": "Summons a scooter on the post.", + "icon": "fas fa-flag-usa", + "color": "text-muted", + "price": 150, + "deflectable": False, + "cosmetic": True + }, + "wholesome": { + "kind": "wholesome", + "title": "Wholesome", + "description": "Summons a wholesome marsey on the post.", + "icon": "fas fa-smile-beam", + "color": "text-yellow", + "price": 150, + "deflectable": False, + "cosmetic": True + }, + "firework": { + "kind": "firework", + "title": "Fireworks", + "description": "Summons fireworks on the post.", + "icon": "fas fa-bahai", + "color": "text-danger", + "price": 150, + "deflectable": False, + "cosmetic": True + }, + "confetti": { + "kind": "confetti", + "title": "Confetti", + "description": "Summons confetti to fall on the post.", + "icon": "fas fa-party-horn", + "color": "text-yellow", + "price": 150, + "deflectable": False, + "cosmetic": True + }, + "ricardo": { + "kind": "ricardo", + "title": "Stripper Cake", + "description": "Summons Ricardo to dance on the post.", + "icon": "fas fa-pinata", + "color": "text-pink", + "price": 150, + "deflectable": False, + "cosmetic": True + }, + "tilt": { + "kind": "tilt", + "title": "Tilt", + "description": "Tilts the post or comment", + "icon": "fas fa-car-tilt", + "color": "text-blue", + "price": 150, + "deflectable": False, + "cosmetic": True + }, + "glowie": { + "kind": "glowie", + "title": "Glowie", + "description": "Indicates that the recipient can be seen when driving. Just run them over.", + "icon": "fas fa-user-secret", + "color": "text-green", + "price": 150, + "deflectable": False, + "cosmetic": True + }, + "rehab": { + "kind": "rehab", + "title": "Rehab", + "description": "Prevents the user from gambling for 24 hours in a last ditch effort to save them from themself.", + "icon": "fas fa-dice-six", + "color": "text-black", + "price": 777, + "deflectable": True, + "cosmetic": False + }, + "agendaposter": { + "kind": "agendaposter", + "title": "Chud", + "description": "Chuds the recipient for 24 hours.", + "icon": "fas fa-snooze", + "color": "text-purple", + "price": 1000, + "deflectable": True, + "cosmetic": False + }, + "offsitementions": { + "kind": "offsitementions", + "title": "Y'all Seein' Eye", + "description": "Gives the recipient access to notifications when people off-site talk about us.", + "icon": "fas fa-eyes", + "color": "text-orange", + "price": 1000, + "deflectable": True, + "cosmetic": False + }, + "lootbox": { + "kind": "lootbox", + "title": "Lootbox", + "description": "", + "icon": "fas fa-box-open", + "color": "text-blue", + "price": 1000, + "deflectable": True, + "cosmetic": False + }, + "beano": { + "kind": "beano", + "title": "Beano", + "description": "Stops you from embarrassing yourself with your flatulence", + "icon": "fas fa-gas-pump-slash", + "color": "text-green", + "price": 1000, + "deflectable": True, + "cosmetic": False + }, + "unpin": { + "kind": "unpin", + "title": "Unpin", + "description": "Removes 1 hour from the pin duration of a post or 6 hours from the pin duration of a comment.", + "icon": "fas fa-thumbtack fa-rotate--45", + "color": "text-black", + "price": 1000, + "deflectable": False, + "cosmetic": False + }, + "flairlock": { + "kind": "flairlock", + "title": "1-Day Flairlock", + "description": "Sets a flair for the recipient and locks it for 24 hours.", + "icon": "fas fa-lock", + "color": "text-black", + "price": 1250, + "deflectable": True, + "cosmetic": False + }, + "pin": { + "kind": "pin", + "title": "Pin", + "description": "Pins a post for 1 hour or a comment for 6 hours.", + "icon": "fas fa-thumbtack fa-rotate--45", + "color": "text-warning", + "price": 1500, + "deflectable": False, + "cosmetic": False + }, + "progressivestack": { + "kind": "progressivestack", + "title": "Progressive Stack", + "description": "Makes votes on the recipient's posts and comments weigh double in the ranking algorithm for 6 hours.", + "icon": "fas fa-bullhorn", + "color": "text-danger", + "price": 1500, + "deflectable": True, + "cosmetic": False + }, + "pizzashill": { + "kind": "pizzashill", + "title": "Pizzashill", + "description": "Forces the recipient to make all posts/comments > 280 characters for 24 hours.", + "icon": "fas fa-pizza-slice", + "color": "text-orange", + "price": 1500, + "deflectable": True, + "cosmetic": False + }, + "bird": { + "kind": "bird", + "title": "Bird Site", + "description": "Forces the recipient to make all posts/comments < 140 characters for 24 hours.", + "icon": "fab fa-twitter", + "color": "text-blue", + "price": 1500, + "deflectable": True, + "cosmetic": False + }, + "spider": { + "kind": "spider", + "title": "Spider!", + "description": f"Summons a spider to terrorize the recipient for 24 hours.", + "icon": "fas fa-spider", + "color": "text-brown", + "price": 2000, + "deflectable": True, + "cosmetic": False + }, + "deflector": { + "kind": "deflector", + "title": "Deflector", + "description": "Causes most awards received for the next 10 hours to be deflected back at their giver.", + "icon": "fas fa-shield", + "color": "text-pink", + "price": 2750, + "deflectable": True, + "cosmetic": False + }, + "marsey": { + "kind": "marsey", + "title": "Marsey", + "description": "Makes the recipient unable to post/comment anything but marsey emojis for 24 hours.", + "icon": "fas fa-cat", + "color": "text-orange", + "price": 3000, + "deflectable": True, + "cosmetic": False + }, + "ban": { + "kind": "ban", + "title": "1-Day Ban", + "description": "Bans the recipient for a day.", + "icon": "fas fa-gavel", + "color": "text-danger", + "price": 3000, + "deflectable": True, + "cosmetic": False + }, + "unban": { + "kind": "unban", + "title": "1-Day Unban", + "description": "Removes 1 day from the ban duration of the recipient.", + "icon": "fas fa-gavel", + "color": "text-success", + "price": 3500, + "deflectable": True, + "cosmetic": False + }, + "benefactor": { + "kind": "benefactor", + "title": "Benefactor", + "description": f"Grants one month of {patron} status and 2500 marseybux to the recipient. Cannot be used on yourself.", + "icon": "fas fa-gift", + "color": "text-blue", + "price": 4000, + "deflectable": False, + "cosmetic": False + }, + "grass": { + "kind": "grass", + "title": "Grass", + "description": "Ban the recipient for 30 days (if they provide a timestamped picture of them touching grass/snow/sand/ass to the admins, they will get unbanned immediately)", + "icon": "fas fa-seedling", + "color": "text-success", + "price": 10000, + "deflectable": True, + "cosmetic": False + }, + "eye": { + "kind": "eye", + "title": "All-Seeing Eye", + "description": "Gives the recipient the ability to view private profiles.", + "icon": "fas fa-eye", + "color": "text-silver", + "price": 10000, + "deflectable": True, + "cosmetic": False + }, + "unblockable": { + "kind": "unblockable", + "title": "Unblockable", + "description": "Makes the recipient unblockable and removes all blocks on them.", + "icon": "fas fa-laugh-squint", + "color": "text-lightgreen", + "price": 20000, + "deflectable": True, + "cosmetic": False + }, + "fish": { + "kind": "fish", + "title": "Fish", + "description": "This user cannot be unfollowed", + "icon": "fas fa-fish", + "color": "text-lightblue", + "price": 20000, + "deflectable": True, + "cosmetic": False + }, + "pause": { + "kind": "pause", + "title": "Pause", + "description": "Gives the recipient the ability to pause profile anthems.", + "icon": "fas fa-volume-mute", + "color": "text-danger", + "price": 20000, + "deflectable": True, + "cosmetic": False + }, + "unpausable": { + "kind": "unpausable", + "title": "Unpausable", + "description": "Makes the profile anthem of the recipient unpausable.", + "icon": "fas fa-volume", + "color": "text-success", + "price": 40000, + "deflectable": True, + "cosmetic": False + }, + "alt": { + "kind": "alt", + "title": "Alt-Seeing Eye", + "description": "Gives the recipient the ability to view alts.", + "icon": "fas fa-eye", + "color": "text-gold", + "price": 50000, + "deflectable": True, + "cosmetic": False + }, + "checkmark": { + "kind": "checkmark", + "title": "Checkmark", + "description": "Gives the recipient a checkmark.", + "icon": "fas fa-badge-check", + "color": "checkmark", + "price": 50000, + "deflectable": True, + "cosmetic": False + }, +} + +if SITE_NAME != 'rDrama': + EXTRA_AWARDS = { + "owoify": { + "kind": "owoify", + "title": "OwOify", + "description": "OwOifies the recipient's comments for 6 hours.", + "icon": "fas fa-paw-simple", + "color": "text-purple", + "price": 400, + "deflectable": True, + "cosmetic": False + }, + "rainbow": { + "kind": "rainbow", + "title": "Rainbow", + "description": "Makes the recipient's comments and posts in rainbow text for 24 hours.", + "icon": "fas fa-cloud-rainbow", + "color": "text-pink", + "price": 400, + "deflectable": True, + "cosmetic": False + }, + } + AWARDS.update(EXTRA_AWARDS) + +if SITE_NAME == 'PCM': + PCM_AWARDS = { + "croag": { + "kind": "croag", + "title": "Croag", + "description": "Summons Croag on the post.", + "icon": "fas fa-head-side", + "color": "text-gold", + "price": 150, + "deflectable": False, + "cosmetic": True + }, + "toe": { + "kind": "toe", + "title": "Toe Hype", + "description": "Summons Blade's toe on the post.", + "icon": "fas fa-socks", + "color": "text-blue", + "price": 150, + "deflectable": False, + "cosmetic": True + }, + "crab": { + "kind": "crab", + "title": "Crab", + "description": "Rave time!", + "icon": "fas fa-crab", + "color": "text-danger", + "price": 4000, + "deflectable": False, + "cosmetic": True + } + } + AWARDS.update(PCM_AWARDS) + +# Permit only cosmetics and pin/unpin on ghosted things. +for award in AWARDS: + AWARDS[award]['ghost'] = AWARDS[award]['cosmetic'] +AWARDS['pin']['ghost'] = True +AWARDS['unpin']['ghost'] = True + +# Disable unused awards, and site-specific award inclusion/exclusion. +AWARDS_DISABLED = [ + 'fallback', 'ghost', 'nword', 'lootbox', # Generic + 'snow', 'gingerbread', 'lights', 'candycane', 'fireplace', 'grinch', # Fistmas + 'haunt', 'upsidedown', 'stab', 'spiders', 'fog', # Homoween '21 + 'jumpscare', 'hw-bite', 'hw-vax', 'hw-grinch', 'flashlight', # Homoween '22 + 'candy-corn', 'ectoplasm', 'bones', 'pumpkin', # Homoween '22 (cont'd) +] + + +HOUSE_AWARDS = { + "Furry": { + "kind": "Furry", + "title": "OwOify", + "description": "OwOifies the recipient's comments for 6 hours.", + "icon": "fas fa-paw-simple", + "color": "text-purple", + "price": 400, + "deflectable": True, + "cosmetic": False, + "ghost": False, + }, + "Femboy": { + "kind": "Femboy", + "title": "Rainbow", + "description": "Makes the recipient's comments and posts in rainbow text for 24 hours.", + "icon": "fas fa-cloud-rainbow", + "color": "text-pink", + "price": 400, + "deflectable": True, + "cosmetic": False, + "ghost": False, + }, + "Vampire": { + "kind": "Vampire", + "title": "Bite", + "description": "Turns the recipient into a vampire for 2 days.", + "icon": "fas fa-bat", + "color": "text-gray", + "price": 400, + "deflectable": True, + "cosmetic": False, + "ghost": False, + }, + "Racist": { + "kind": "Racist", + "title": "Early Life", + "description": "Checks the recipient's Early Life section on Wikipedia. Notices.", + "icon": "fas fa-star-of-david", + "color": "text-yellow", + "price": 400, + "deflectable": True, + "cosmetic": False, + "ghost": False, + }, +} + +temp = deepcopy(HOUSE_AWARDS).items() +for k, val in temp: + HOUSE_AWARDS[f'{k} Founder'] = val + HOUSE_AWARDS[f'{k} Founder']['kind'] += ' Founder' + HOUSE_AWARDS[f'{k} Founder']['price'] = int(HOUSE_AWARDS[f'{k} Founder']['price'] * 0.75) + +if SITE_NAME != 'rDrama': + AWARDS_DISABLED.append('progressivestack') + +if SITE_NAME == 'PCM': + # Previous set of disabled, changed temporarily by request 2022-10-17 + #AWARDS_DISABLED.extend(['ban','pizzashill','marsey','bird','grass','chud','unblockable']) + AWARDS_DISABLED.extend(['unblockable']) + AWARDS_DISABLED.remove('ghost') +elif SITE_NAME == 'WPD': + AWARDS_DISABLED.remove('lootbox') +if not FEATURES['MARSEYBUX']: + AWARDS_DISABLED.append('benefactor') + +AWARDS_ENABLED = {x: AWARDS[x] for x in AWARDS if x not in AWARDS_DISABLED} diff --git a/files/helpers/const.py b/files/helpers/config/const.py similarity index 75% rename from files/helpers/const.py rename to files/helpers/config/const.py index b8f0a7e1d..ccc8044b0 100644 --- a/files/helpers/const.py +++ b/files/helpers/config/const.py @@ -1,4 +1,3 @@ -from copy import deepcopy from enum import Enum, auto from os import environ, path @@ -72,9 +71,6 @@ SESSION_LIFETIME = 60 * 60 * 24 * 365 CASINO_RELEASE_DAY = 1662825600 -if SITE_NAME == 'rDrama': patron = 'Paypig' -else: patron = 'Patron' - AJ_REPLACEMENTS = { ' your ': " you're ", ' to ': " too ", @@ -184,11 +180,12 @@ profanity_single_words = "|".join([profanity.lower() for profanity in PROFANITIE LONGPOST_REPLIES = ('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.", '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.", f'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 here was the best option?', "I don't have enough spoons to read this shit", "All those words won't bring daddy back.", 'OUT!', "Damn, you're really mad over this, but thanks for the effort you put into typing that all out! Sadly I won't read it all.", "Jesse what the fuck are you talking about??", "▼you're fucking bananas if you think I'm reading all that, take my downvote and shut up idiot", "Are you feeling okay bud?", ':#marseywoah:', 'At no point in your rambling, incoherent post were you even close to anything that could be considered a rational thought. Everyone on this site is now dumber for having read it. May God have mercy on your soul.') - AGENDAPOSTER_PHRASE = 'trans lives matter' - -AGENDAPOSTER_MSG = """Hi @{username},\nYour {type} has been automatically removed because you forgot to include `{AGENDAPOSTER_PHRASE}`.\nDon't worry, we're here to help! We won't let you post or comment anything that doesn't express your love and acceptance towards the trans community. Feel free to resubmit your {type} with `{AGENDAPOSTER_PHRASE}` included. \n*This is an automated message; if you need help, you can message us [here](/contact).*""" +AGENDAPOSTER_MSG = """Hi @{username},\n +Your {type} has been automatically removed because you forgot to include `{AGENDAPOSTER_PHRASE}`.\n +Don't worry, we're here to help! We won't let you post or comment anything that doesn't express your love and acceptance towards the trans community. Feel free to resubmit your {type} with `{AGENDAPOSTER_PHRASE}` included. \n +*This is an automated message; if you need help, you can message us [here](/contact).*""" AGENDAPOSTER_MSG_HTML = """

Hi @{username},

Your {type} has been automatically removed because you forgot to include {AGENDAPOSTER_PHRASE}.

@@ -207,6 +204,18 @@ SORTS = COMMENT_SORTS + ["bump", "comments"] TIME_FILTERS = ["hour", "day", "week", "month", "year", "all"] PAGE_SIZES = (10, 25, 50, 100) +################################################################################ +### COLUMN INFO +################################################################################ + +SUB_NAME_COLUMN_LENGTH = 25 +SUB_SIDEBAR_COLUMN_LENGTH = 10000 +SUB_SIDEBAR_HTML_COLUMN_LENGTH = 20000 +SUB_SIDEBAR_URL_COLUMN_LENGTH = 60 +SUB_BANNER_URL_COLUMN_LENGTH = 60 +SUB_CSS_COLUMN_LENGTH = 6000 +SUB_MARSEY_URL_LENGTH = 60 + ################################################################################ ### SITE SPECIFIC CONSTANTS ################################################################################ @@ -395,7 +404,10 @@ COMMENT_MAX_DEPTH = 200 TRANSFER_MESSAGE_LENGTH_LIMIT = 200 # do not make larger than 10000 characters (comment limit) without altering the table MIN_REPOST_CHECK_URL_LENGTH = 9 # also change the constant in checkRepost() of submit.js CHAT_LENGTH_LIMIT = 1000 +SUB_BANNER_LIMIT = 10 + COSMETIC_AWARD_COIN_AWARD_PCT = 0.10 + TRUESCORE_CHAT_MINIMUM = 0 TRUESCORE_DONATE_MINIMUM = 100 TRUESCORE_GHOST_MINIMUM = 0 @@ -468,7 +480,7 @@ LEADERBOARD_LIMIT = PAGE_SIZE HOUSE_JOIN_COST = 500 HOUSE_SWITCH_COST = 2000 -DONATE_SERVICE = "Gumroad" if not KOFI_TOKEN or KOFI_TOKEN == DEFAULT_CONFIG_VALUE else "KoFi" +DONATE_SERVICE = "Gumroad" if not KOFI_TOKEN or KOFI_TOKEN == DEFAULT_CONFIG_VALUE else "KoFi" DONATE_LINK = GUMROAD_LINK if not KOFI_TOKEN or KOFI_TOKEN == DEFAULT_CONFIG_VALUE else KOFI_LINK TIERS_ID_TO_NAME = { 1: "Paypig", @@ -633,7 +645,8 @@ elif SITE == 'watchpeopledie.tv': PERMS['POST_EDITING'] = 2 PERMS['ADMIN_ADD'] = 4 - POLL_MAX_OPTIONS = 30 + SUB_BANNER_LIMIT = 69420 + POLL_MAX_OPTIONS = 50 ERROR_TITLES.update({ 400: "Bad Request", @@ -700,6 +713,11 @@ else: # localhost or testing environment implied FEATURES['HOUSES'] = True FEATURES['USERS_PERMANENT_WORD_FILTERS'] = True FEATURES['STREAMERS'] = True + SUB_BANNER_LIMIT = 69420 + +patron = "Patron" +if SITE_NAME == 'rDrama': + patron = "Paypig" HOUSES = ("None","Furry","Femboy","Vampire","Racist") if FEATURES['HOUSES'] else ("None") @@ -710,757 +728,9 @@ COLORS = {'ff66ac','805ad5','62ca56','38a169','80ffff','2a96f3','eb4963','ff0000 BAN_EVASION_DOMAIN = 'stupidpol.site' BAN_EVASION_FULL = f'https://{BAN_EVASION_DOMAIN}' -AWARDS = { - "fallback": { - "kind": "fallback", - "title": "Unknown", - "description": "", - "icon": "fas fa-block-question", - "color": "text-white", - "price": 0, - "deflectable": False, - "cosmetic": False - }, - ### Deprecated - "ghost": { - "kind": "ghost", - "title": "Ghost", - "description": "", - "icon": "fas fa-ghost", - "color": "text-white", - "price": 3000, - "deflectable": False, - "cosmetic": False - }, - "nword": { - "kind": "nword", - "title": "Nword Pass", - "description": "", - "icon": "fas fa-edit", - "color": "text-success", - "price": 10000, - "deflectable": True, - "cosmetic": False - }, - ### Fistmas 2021 - "snow": { - "kind": "snow", - "title": "Snow", - "description": "", - "icon": "fas fa-snowflake", - "color": "text-blue-200", - "price": 300, - "deflectable": False, - "cosmetic": True - }, - "gingerbread": { - "kind": "gingerbread", - "title": "Gingerbread", - "description": "", - "icon": "fas fa-gingerbread-man", - "color": "", - "price": 300, - "deflectable": False, - "cosmetic": True - }, - "lights": { - "kind": "lights", - "title": "Lights", - "description": "", - "icon": "fas fa-lights-holiday", - "color": "", - "price": 300, - "deflectable": False, - "cosmetic": True - }, - "candycane": { - "kind": "candycane", - "title": "Candy Cane", - "description": "", - "icon": "fas fa-candy-cane", - "color": "", - "price": 400, - "deflectable": False, - "cosmetic": True - }, - "fireplace": { - "kind": "fireplace", - "title": "Fireplace", - "description": "", - "icon": "fas fa-fireplace", - "color": "", - "price": 600, - "deflectable": False, - "cosmetic": True - }, - "grinch": { - "kind": "grinch", - "title": "Grinch", - "description": "", - "icon": "fas fa-angry", - "color": "text-green-500", - "price": 1000, - "deflectable": True, - "cosmetic": False - }, - ### Homoween 2021 & 2022 - "haunt": { - "kind": "haunt", - "title": "Haunt", - "description": "", - "icon": "fas fa-book-dead", - "color": "text-warning", - "price": 500, - "deflectable": False, - "cosmetic": True - }, - "upsidedown": { - "kind": "upsidedown", - "title": "The Upside Down", - "description": "", - "icon": "fas fa-lights-holiday", - "color": "", - "price": 400, - "deflectable": False, - "cosmetic": True - }, - "stab": { - "kind": "stab", - "title": "Stab", - "description": "", - "icon": "fas fa-knife-kitchen", - "color": "text-danger", - "price": 300, - "deflectable": False, - "cosmetic": True - }, - "spiders": { - "kind": "spiders", - "title": "Spiders", - "description": "", - "icon": "fas fa-spider", - "color": "text-black", - "price": 200, - "deflectable": False, - "cosmetic": True - }, - "fog": { - "kind": "fog", - "title": "Fog", - "description": "", - "icon": "fas fa-smoke", - "color": "text-gray", - "price": 200, - "deflectable": False, - "cosmetic": True - }, - ### Homoween 2022 - "jumpscare": { - "kind": "jumpscare", - "title": "Jumpscare", - "description": "", - "icon": "fas fa-coffin-cross", - "color": "text-purple", - "price": 600, - "deflectable": True, - "cosmetic": False - }, - "hw-bite": { - "kind": "hw-bite", - "title": "Zombie Bite", - "description": "", - "icon": "fas fa-biohazard", - "color": "text-danger", - "price": 500, - "deflectable": True, - "cosmetic": False - }, - "hw-vax": { - "kind": "hw-vax", - "title": "Vaxxmaxx", - "description": "", - "icon": "fas fa-syringe", - "color": "text-blue", - "price": 500, - "deflectable": True, - "cosmetic": False - }, - "hw-grinch": { - "kind": "hw-grinch", - "title": "Hallowgrinch", - "description": "", - "icon": "fas fa-angry", - "color": "text-orange", - "price": 1000, - "deflectable": True, - "cosmetic": False - }, - "flashlight": { - "kind": "flashlight", - "title": "Flashlight", - "description": "", - "icon": "fas fa-flashlight", - "color": "text-black", - "price": 400, - "deflectable": False, - "cosmetic": True - }, - "candy-corn": { - "kind": "candy-corn", - "title": "Candy Corn", - "description": "", - "icon": "fas fa-candy-corn", - "color": "text-orange", - "price": 400, - "deflectable": False, - "cosmetic": True - }, - "ectoplasm": { - "kind": "ectoplasm", - "title": "Ectoplasm", - "description": "", - "icon": "fas fa-ghost", - "color": "text-success", - "price": 400, - "deflectable": False, - "cosmetic": True - }, - "bones": { - "kind": "bones", - "title": "Bones", - "description": "", - "icon": "fas fa-bone", - "color": "text-white", - "price": 200, - "deflectable": False, - "cosmetic": True - }, - "pumpkin": { - "kind": "pumpkin", - "title": "Pumpkin", - "description": "", - "icon": "fas fa-jack-o-lantern", - "color": "text-orange", - "price": 200, - "deflectable": False, - "cosmetic": True - }, - ### Standard - "marsify": { - "kind": "marsify", - "title": "Marsify", - "description": "Marsifies the recipient's comments for 24 hours.", - "icon": "fas fa-cat", - "color": "text-white", - "price": 150, - "deflectable": True, - "cosmetic": False - }, - "shit": { - "kind": "shit", - "title": "Shit", - "description": "Makes flies swarm the post.", - "icon": "fas fa-poop", - "color": "text-black-50", - "price": 150, - "deflectable": False, - "cosmetic": True - }, - "fireflies": { - "kind": "fireflies", - "title": "Fireflies", - "description": "Makes fireflies swarm the post.", - "icon": "fas fa-sparkles", - "color": "text-warning", - "price": 150, - "deflectable": False, - "cosmetic": True - }, - "train": { - "kind": "train", - "title": "Train", - "description": "Summons a train on the post.", - "icon": "fas fa-train", - "color": "text-pink", - "price": 150, - "deflectable": False, - "cosmetic": True - }, - "scooter": { - "kind": "scooter", - "title": "Scooter", - "description": "Summons a scooter on the post.", - "icon": "fas fa-flag-usa", - "color": "text-muted", - "price": 150, - "deflectable": False, - "cosmetic": True - }, - "wholesome": { - "kind": "wholesome", - "title": "Wholesome", - "description": "Summons a wholesome marsey on the post.", - "icon": "fas fa-smile-beam", - "color": "text-yellow", - "price": 150, - "deflectable": False, - "cosmetic": True - }, - "firework": { - "kind": "firework", - "title": "Fireworks", - "description": "Summons fireworks on the post.", - "icon": "fas fa-bahai", - "color": "text-danger", - "price": 150, - "deflectable": False, - "cosmetic": True - }, - "confetti": { - "kind": "confetti", - "title": "Confetti", - "description": "Summons confetti to fall on the post.", - "icon": "fas fa-party-horn", - "color": "text-yellow", - "price": 150, - "deflectable": False, - "cosmetic": True - }, - "ricardo": { - "kind": "ricardo", - "title": "Stripper Cake", - "description": "Summons Ricardo to dance on the post.", - "icon": "fas fa-pinata", - "color": "text-pink", - "price": 150, - "deflectable": False, - "cosmetic": True - }, - "tilt": { - "kind": "tilt", - "title": "Tilt", - "description": "Tilts the post or comment", - "icon": "fas fa-car-tilt", - "color": "text-blue", - "price": 150, - "deflectable": False, - "cosmetic": True - }, - "glowie": { - "kind": "glowie", - "title": "Glowie", - "description": "Indicates that the recipient can be seen when driving. Just run them over.", - "icon": "fas fa-user-secret", - "color": "text-green", - "price": 150, - "deflectable": False, - "cosmetic": True - }, - "rehab": { - "kind": "rehab", - "title": "Rehab", - "description": "Prevents the user from gambling for 24 hours in a last ditch effort to save them from themself.", - "icon": "fas fa-dice-six", - "color": "text-black", - "price": 777, - "deflectable": True, - "cosmetic": False - }, - "agendaposter": { - "kind": "agendaposter", - "title": "Chud", - "description": "Chuds the recipient for 24 hours.", - "icon": "fas fa-snooze", - "color": "text-purple", - "price": 1000, - "deflectable": True, - "cosmetic": False - }, - "offsitementions": { - "kind": "offsitementions", - "title": "Y'all Seein' Eye", - "description": "Gives the recipient access to notifications when people off-site talk about us.", - "icon": "fas fa-eyes", - "color": "text-orange", - "price": 1000, - "deflectable": True, - "cosmetic": False - }, - "lootbox": { - "kind": "lootbox", - "title": "Lootbox", - "description": "", - "icon": "fas fa-box-open", - "color": "text-blue", - "price": 1000, - "deflectable": True, - "cosmetic": False - }, - "beano": { - "kind": "beano", - "title": "Beano", - "description": "Stops you from embarrassing yourself with your flatulence", - "icon": "fas fa-gas-pump-slash", - "color": "text-green", - "price": 1000, - "deflectable": True, - "cosmetic": False - }, - "unpin": { - "kind": "unpin", - "title": "Unpin", - "description": "Removes 1 hour from the pin duration of a post or 6 hours from the pin duration of a comment.", - "icon": "fas fa-thumbtack fa-rotate--45", - "color": "text-black", - "price": 1000, - "deflectable": False, - "cosmetic": False - }, - "flairlock": { - "kind": "flairlock", - "title": "1-Day Flairlock", - "description": "Sets a flair for the recipient and locks it for 24 hours.", - "icon": "fas fa-lock", - "color": "text-black", - "price": 1250, - "deflectable": True, - "cosmetic": False - }, - "pin": { - "kind": "pin", - "title": "Pin", - "description": "Pins a post for 1 hour or a comment for 6 hours.", - "icon": "fas fa-thumbtack fa-rotate--45", - "color": "text-warning", - "price": 1500, - "deflectable": False, - "cosmetic": False - }, - "progressivestack": { - "kind": "progressivestack", - "title": "Progressive Stack", - "description": "Makes votes on the recipient's posts and comments weigh double in the ranking algorithm for 6 hours.", - "icon": "fas fa-bullhorn", - "color": "text-danger", - "price": 1500, - "deflectable": True, - "cosmetic": False - }, - "pizzashill": { - "kind": "pizzashill", - "title": "Pizzashill", - "description": "Forces the recipient to make all posts/comments > 280 characters for 24 hours.", - "icon": "fas fa-pizza-slice", - "color": "text-orange", - "price": 1500, - "deflectable": True, - "cosmetic": False - }, - "bird": { - "kind": "bird", - "title": "Bird Site", - "description": "Forces the recipient to make all posts/comments < 140 characters for 24 hours.", - "icon": "fab fa-twitter", - "color": "text-blue", - "price": 1500, - "deflectable": True, - "cosmetic": False - }, - "spider": { - "kind": "spider", - "title": "Spider!", - "description": f"Summons a spider to terrorize the recipient for 24 hours.", - "icon": "fas fa-spider", - "color": "text-brown", - "price": 2000, - "deflectable": True, - "cosmetic": False - }, - "deflector": { - "kind": "deflector", - "title": "Deflector", - "description": "Causes most awards received for the next 10 hours to be deflected back at their giver.", - "icon": "fas fa-shield", - "color": "text-pink", - "price": 2750, - "deflectable": True, - "cosmetic": False - }, - "marsey": { - "kind": "marsey", - "title": "Marsey", - "description": "Makes the recipient unable to post/comment anything but marsey emojis for 24 hours.", - "icon": "fas fa-cat", - "color": "text-orange", - "price": 3000, - "deflectable": True, - "cosmetic": False - }, - "ban": { - "kind": "ban", - "title": "1-Day Ban", - "description": "Bans the recipient for a day.", - "icon": "fas fa-gavel", - "color": "text-danger", - "price": 3000, - "deflectable": True, - "cosmetic": False - }, - "unban": { - "kind": "unban", - "title": "1-Day Unban", - "description": "Removes 1 day from the ban duration of the recipient.", - "icon": "fas fa-gavel", - "color": "text-success", - "price": 3500, - "deflectable": True, - "cosmetic": False - }, - "benefactor": { - "kind": "benefactor", - "title": "Benefactor", - "description": f"Grants one month of {patron} status and 2500 marseybux to the recipient. Cannot be used on yourself.", - "icon": "fas fa-gift", - "color": "text-blue", - "price": 4000, - "deflectable": False, - "cosmetic": False - }, - "grass": { - "kind": "grass", - "title": "Grass", - "description": "Ban the recipient for 30 days (if they provide a timestamped picture of them touching grass/snow/sand/ass to the admins, they will get unbanned immediately)", - "icon": "fas fa-seedling", - "color": "text-success", - "price": 10000, - "deflectable": True, - "cosmetic": False - }, - "eye": { - "kind": "eye", - "title": "All-Seeing Eye", - "description": "Gives the recipient the ability to view private profiles.", - "icon": "fas fa-eye", - "color": "text-silver", - "price": 10000, - "deflectable": True, - "cosmetic": False - }, - "unblockable": { - "kind": "unblockable", - "title": "Unblockable", - "description": "Makes the recipient unblockable and removes all blocks on them.", - "icon": "fas fa-laugh-squint", - "color": "text-lightgreen", - "price": 20000, - "deflectable": True, - "cosmetic": False - }, - "fish": { - "kind": "fish", - "title": "Fish", - "description": "This user cannot be unfollowed", - "icon": "fas fa-fish", - "color": "text-lightblue", - "price": 20000, - "deflectable": True, - "cosmetic": False - }, - "pause": { - "kind": "pause", - "title": "Pause", - "description": "Gives the recipient the ability to pause profile anthems.", - "icon": "fas fa-volume-mute", - "color": "text-danger", - "price": 20000, - "deflectable": True, - "cosmetic": False - }, - "unpausable": { - "kind": "unpausable", - "title": "Unpausable", - "description": "Makes the profile anthem of the recipient unpausable.", - "icon": "fas fa-volume", - "color": "text-success", - "price": 40000, - "deflectable": True, - "cosmetic": False - }, - "alt": { - "kind": "alt", - "title": "Alt-Seeing Eye", - "description": "Gives the recipient the ability to view alts.", - "icon": "fas fa-eye", - "color": "text-gold", - "price": 50000, - "deflectable": True, - "cosmetic": False - }, - "checkmark": { - "kind": "checkmark", - "title": "Checkmark", - "description": "Gives the recipient a checkmark.", - "icon": "fas fa-badge-check", - "color": "checkmark", - "price": 50000, - "deflectable": True, - "cosmetic": False - }, -} - -if SITE_NAME != 'rDrama': - EXTRA_AWARDS = { - "owoify": { - "kind": "owoify", - "title": "OwOify", - "description": "OwOifies the recipient's comments for 6 hours.", - "icon": "fas fa-paw-simple", - "color": "text-purple", - "price": 400, - "deflectable": True, - "cosmetic": False - }, - "rainbow": { - "kind": "rainbow", - "title": "Rainbow", - "description": "Makes the recipient's comments and posts in rainbow text for 24 hours.", - "icon": "fas fa-cloud-rainbow", - "color": "text-pink", - "price": 400, - "deflectable": True, - "cosmetic": False - }, - } - AWARDS.update(EXTRA_AWARDS) - -if SITE_NAME == 'PCM': - PCM_AWARDS = { - "croag": { - "kind": "croag", - "title": "Croag", - "description": "Summons Croag on the post.", - "icon": "fas fa-head-side", - "color": "text-gold", - "price": 150, - "deflectable": False, - "cosmetic": True - }, - "toe": { - "kind": "toe", - "title": "Toe Hype", - "description": "Summons Blade's toe on the post.", - "icon": "fas fa-socks", - "color": "text-blue", - "price": 150, - "deflectable": False, - "cosmetic": True - }, - "crab": { - "kind": "crab", - "title": "Crab", - "description": "Rave time!", - "icon": "fas fa-crab", - "color": "text-danger", - "price": 4000, - "deflectable": False, - "cosmetic": True - } - } - AWARDS.update(PCM_AWARDS) - -# Permit only cosmetics and pin/unpin on ghosted things. -for award in AWARDS: - AWARDS[award]['ghost'] = AWARDS[award]['cosmetic'] -AWARDS['pin']['ghost'] = True -AWARDS['unpin']['ghost'] = True - -# Disable unused awards, and site-specific award inclusion/exclusion. -AWARDS_DISABLED = [ - 'fallback', 'ghost', 'nword', 'lootbox', # Generic - 'snow', 'gingerbread', 'lights', 'candycane', 'fireplace', 'grinch', # Fistmas - 'haunt', 'upsidedown', 'stab', 'spiders', 'fog', # Homoween '21 - 'jumpscare', 'hw-bite', 'hw-vax', 'hw-grinch', 'flashlight', # Homoween '22 - 'candy-corn', 'ectoplasm', 'bones', 'pumpkin', # Homoween '22 (cont'd) -] - - -HOUSE_AWARDS = { - "Furry": { - "kind": "Furry", - "title": "OwOify", - "description": "OwOifies the recipient's comments for 6 hours.", - "icon": "fas fa-paw-simple", - "color": "text-purple", - "price": 400, - "deflectable": True, - "cosmetic": False, - "ghost": False, - }, - "Femboy": { - "kind": "Femboy", - "title": "Rainbow", - "description": "Makes the recipient's comments and posts in rainbow text for 24 hours.", - "icon": "fas fa-cloud-rainbow", - "color": "text-pink", - "price": 400, - "deflectable": True, - "cosmetic": False, - "ghost": False, - }, - "Vampire": { - "kind": "Vampire", - "title": "Bite", - "description": "Turns the recipient into a vampire for 2 days.", - "icon": "fas fa-bat", - "color": "text-gray", - "price": 400, - "deflectable": True, - "cosmetic": False, - "ghost": False, - }, - "Racist": { - "kind": "Racist", - "title": "Early Life", - "description": "Checks the recipient's Early Life section on Wikipedia. Notices.", - "icon": "fas fa-star-of-david", - "color": "text-yellow", - "price": 400, - "deflectable": True, - "cosmetic": False, - "ghost": False, - }, -} - -temp = deepcopy(HOUSE_AWARDS).items() -for k, val in temp: - HOUSE_AWARDS[f'{k} Founder'] = val - HOUSE_AWARDS[f'{k} Founder']['kind'] += ' Founder' - HOUSE_AWARDS[f'{k} Founder']['price'] = int(HOUSE_AWARDS[f'{k} Founder']['price'] * 0.75) - -if SITE_NAME != 'rDrama': - AWARDS_DISABLED.append('progressivestack') - -if SITE_NAME == 'PCM': - # Previous set of disabled, changed temporarily by request 2022-10-17 - #AWARDS_DISABLED.extend(['ban','pizzashill','marsey','bird','grass','chud','unblockable']) - AWARDS_DISABLED.extend(['unblockable']) - AWARDS_DISABLED.remove('ghost') -elif SITE_NAME == 'WPD': - AWARDS_DISABLED.remove('lootbox') -if not FEATURES['MARSEYBUX']: - AWARDS_DISABLED.append('benefactor') - -AWARDS2 = {x: AWARDS[x] for x in AWARDS if x not in AWARDS_DISABLED} - DOUBLE_XP_ENABLED = -1 # set to unixtime for when DXP begins, -1 to disable -TROLLTITLES = [ - "how will @{username} ever recover?", - "@{username} BTFO", - "[META] Getting really sick of @{username}'s shit", - "Pretty sure this is @{username}'s Reddit account", - "Hey jannies can you please ban @{username}", -] +### COMMENT NOTIFICATIONS ### FORTUNE_REPLIES = ('Your fortune: Allah Wills It','Your fortune: Inshallah, Only Good Things Shall Come To Pass','Your fortune: Allah Smiles At You This Day','Your fortune: Your Bussy Is In For A Blasting','Your fortune: You Will Be Propositioned By A High-Tier Twink','Your fortune: Repent, You Have Displeased Allah And His Vengeance Is Nigh','Your fortune: Reply Hazy, Try Again','Your fortune: lmao you just lost 100 coins','Your fortune: Yikes 😬','Your fortune: You Will Be Blessed With Many Black Bulls','Your fortune: NEETmax, The Day Is Lost If You Venture Outside','Your fortune: A Taste Of Jannah Awaits You Today','Your fortune: Watch Your Back','Your fortune: Outlook good','Your fortune: Godly Luck','Your fortune: Good Luck','Your fortune: Bad Luck','Your fortune: Good news will come to you by mail','Your fortune: Very Bad Luck','Your fortune: ｷﾀ━━━━━━(ﾟ∀ﾟ)━━━━━━ !!!!','Your fortune: Better not tell you now','Your fortune: You will meet a dark handsome stranger','Your fortune: （　´_ゝ`）ﾌｰﾝ','Your fortune: Excellent Luck','Your fortune: Average Luck') FACTCHECK_REPLIES = ('Factcheck: This claim has been confirmed as correct by experts. ','Factcheck: This claim has been classified as misogynistic.','Factcheck: This claim is currently being debunked.','Factcheck: This claim is 100% true.','Factcheck: This claim hurts trans lives.','Factcheck: [REDACTED].','Factcheck: This claim is both true and false.','Factcheck: You really believe that shit? Lmao dumbass nigga 🤣','Factcheck: None of this is real.','Factcheck: Yes.','Factcheck: This claim has not been approved by experts.','Factcheck: This claim is a gross exageration of reality.','Factcheck: WARNING! THIS CLAIM HAS BEEN CLASSIFIED AS DANGEROUS. PLEASE REMAIN STILL, AN AGENT WILL COME TO MEET YOU SHORTLY.') @@ -1492,6 +762,8 @@ if SITE == 'rdrama.net': elif SITE_NAME == 'WPD': REDDIT_NOTIFS_SITE.update({'watchpeopledie', 'makemycoffin'}) +### END COMMENT NOTIFICATIONS ### + discounts = { # Big Spender badges, 2pp additive discount each 69: 0.02, diff --git a/files/helpers/config/modaction_types.py b/files/helpers/config/modaction_types.py new file mode 100644 index 000000000..3c686e274 --- /dev/null +++ b/files/helpers/config/modaction_types.py @@ -0,0 +1,345 @@ +from copy import deepcopy + +MODACTION_TYPES = { + 'chud': { + "str": 'chudded {self.target_link}', + "icon": 'fa-snooze', + "color": 'bg-danger' + }, + 'approve_app': { + "str": 'approved an application by {self.target_link}', + "icon": 'fa-robot', + "color": 'bg-success' + }, + 'badge_grant': { + "str": 'granted badge to {self.target_link}', + "icon": 'fa-badge', + "color": 'bg-success' + }, + 'badge_remove': { + "str": 'removed badge from {self.target_link}', + "icon": 'fa-badge', + "color": 'bg-danger' + }, + 'ban_comment': { + "str": 'removed {self.target_link}', + "icon": 'fa-comment', + "color": 'bg-danger' + }, + 'ban_domain': { + "str": 'banned a domain', + "icon": 'fa-globe', + "color": 'bg-danger' + }, + 'ban_post': { + "str": 'removed post {self.target_link}', + "icon": 'fa-feather-alt', + "color": 'bg-danger' + }, + 'ban_user': { + "str": 'banned user {self.target_link}', + "icon": 'fa-user-slash', + "color": 'bg-danger' + }, + 'delete_report': { + "str": 'deleted report on {self.target_link}', + "icon": 'fa-flag', + "color": 'bg-danger' + }, + 'disable_bots': { + "str": 'disabled bots', + "icon": 'fa-robot', + "color": 'bg-danger' + }, + 'disable_fart_mode': { + "str": 'disabled fart mode', + "icon": 'fa-gas-pump-slash', + "color": 'bg-danger' + }, + 'disable_read_only_mode': { + "str": 'disabled read only mode', + "icon": 'fa-book', + "color": 'bg-danger' + }, + 'disable_signups': { + "str": 'disabled signups', + "icon": 'fa-users', + "color": 'bg-danger' + }, + 'disable_login_required': { + "str": 'disabled login required', + "icon": 'fa-users', + "color": 'bg-danger' + }, + 'disable_under_attack': { + "str": 'disabled under attack mode', + "icon": 'fa-shield', + "color": 'bg-muted' + }, + 'disable_under_siege': { + "str": 'disabled under siege mode', + "icon": 'fa-shield', + "color": 'bg-muted' + }, + 'distinguish_comment': { + "str": 'distinguished {self.target_link}', + "icon": 'fa-crown', + "color": 'bg-success' + }, + 'distinguish_post': { + "str": 'distinguished {self.target_link}', + "icon": 'fa-crown', + "color": 'bg-success' + }, + 'distribute': { + "str": 'distributed bet winnings to voters on {self.target_link}', + "icon": 'fa-dollar-sign', + "color": 'bg-success' + }, + 'clear_internal_cache': { + "str": 'cleared internal cache', + "icon": 'fa-trash-alt', + "color": 'bg-muted' + }, + 'edit_post': { + "str": 'edited {self.target_link}', + "icon": 'fa-edit', + "color": 'bg-primary' + }, + 'edit_rules': { + "str": 'edited the rules', + "icon": 'fa-columns', + "color": 'bg-primary' + }, + 'enable_bots': { + "str": 'enabled bots', + "icon": 'fa-robot', + "color": 'bg-success' + }, + 'enable_fart_mode': { + "str": 'enabled fart mode', + "icon": 'fa-gas-pump', + "color": 'bg-success' + }, + 'enable_read_only_mode': { + "str": 'enabled read only mode', + "icon": 'fa-book', + "color": 'bg-success' + }, + 'enable_signups': { + "str": 'enabled signups', + "icon": 'fa-users', + "color": 'bg-success' + }, + 'enable_login_required': { + "str": 'enabled login required', + "icon": 'fa-users', + "color": 'bg-success' + }, + 'enable_under_attack': { + "str": 'enabled under attack mode', + "icon": 'fa-shield', + "color": 'bg-success' + }, + 'enable_under_siege': { + "str": 'enabled under siege mode', + "icon": 'fa-shield', + "color": 'bg-success', + }, + 'flair_post': { + "str": 'set a flair on {self.target_link}', + "icon": 'fa-tag', + "color": 'bg-primary' + }, + 'link_accounts': { + "str": 'linked {self.target_link}', + "icon": 'fa-link', + "color": 'bg-success' + }, + 'delink_accounts': { + "str": 'delinked {self.target_link}', + "icon": 'fa-link-slash', + "color": 'bg-danger' + }, + 'make_admin': { + "str": 'made {self.target_link} an admin', + "icon": 'fa-user-crown', + "color": 'bg-success' + }, + 'mod_mute_user': { + "str": 'muted reports from user {self.target_link}', + "icon": 'fa-file-signature', + "color": 'bg-danger' + }, + 'mod_unmute_user': { + "str": 'unmuted reports from user {self.target_link}', + "icon": 'fa-file-signature', + "color": 'bg-success' + }, + 'monthly': { + "str": 'distributed monthly marseybux', + "icon": 'fa-sack-dollar', + "color": 'bg-success' + }, + 'move_hole': { + "str": 'changed hole of {self.target_link}', + "icon": 'fa-manhole', + "color": 'bg-primary' + }, + 'nuke_user': { + "str": 'removed all content of {self.target_link}', + "icon": 'fa-radiation-alt', + "color": 'bg-danger' + }, + 'pin_comment': { + "str": 'pinned {self.target_link}', + "icon": 'fa-thumbtack fa-rotate--45', + "color": 'bg-success' + }, + 'pin_post': { + "str": 'pinned post {self.target_link}', + "icon": 'fa-thumbtack fa-rotate--45', + "color": 'bg-success' + }, + 'clear_cloudflare_cache': { + "str": 'cleared cloudflare cache', + "icon": 'fab fa-cloudflare', + "color": 'bg-muted' + }, + 'reject_app': { + "str": 'rejected an application request by {self.target_link}', + "icon": 'fa-robot', + "color": 'bg-muted' + }, + 'remove_admin': { + "str": 'removed {self.target_link} as admin', + "icon": 'fa-user-crown', + "color": 'bg-danger' + }, + 'revert': { + "str": 'reverted {self.target_link} mod actions', + "icon": 'fa-history', + "color": 'bg-danger' + }, + 'revoke_app': { + "str": 'revoked an application by {self.target_link}', + "icon": 'fa-robot', + "color": 'bg-muted' + }, + 'set_flair_locked': { + "str": "set {self.target_link}'s flair (locked)", + "icon": 'fa-award', + "color": 'bg-primary' + }, + 'set_flair_notlocked': { + "str": "set {self.target_link}'s flair (not locked)", + "icon": 'fa-award', + "color": 'bg-primary' + }, + 'set_new': { + "str": 'changed the default sorting of comments on {self.target_link} to `new`', + "icon": 'fa-sparkles', + "color": 'bg-primary' + }, + 'set_hot': { + "str": 'changed the default sorting of comments on {self.target_link} to `hot`', + "icon": 'fa-fire', + "color": 'bg-primary' + }, + 'set_nsfw': { + "str": 'set {self.target_link} as +18', + "icon": 'fa-eye-evil', + "color": 'bg-danger' + }, + 'set_nsfw_comment': { + "str": 'set {self.target_link} as +18', + "icon": 'fa-eye-evil', + "color": 'bg-danger' + }, + 'shadowban': { + "str": 'shadowbanned {self.target_link}', + "icon": 'fa-eye-slash', + "color": 'bg-danger' + }, + 'unchud': { + "str": 'unchudded {self.target_link}', + "icon": 'fa-snooze', + "color": 'bg-success' + }, + 'unban_comment': { + "str": 'reinstated {self.target_link}', + "icon": 'fa-comment', + "color": 'bg-success' + }, + 'unban_domain': { + "str": 'unbanned a domain', + "icon": 'fa-globe', + "color": 'bg-success' + }, + 'unban_post': { + "str": 'reinstated post {self.target_link}', + "icon": 'fa-feather-alt', + "color": 'bg-success' + }, + 'unban_user': { + "str": 'unbanned user {self.target_link}', + "icon": 'fa-user', + "color": 'bg-success' + }, + 'undistinguish_comment': { + "str": 'un-distinguished {self.target_link}', + "icon": 'fa-crown', + "color": 'bg-muted' + }, + 'undistinguish_post': { + "str": 'un-distinguished {self.target_link}', + "icon": 'fa-crown', + "color": 'bg-muted' + }, + 'unnuke_user': { + "str": 'approved all content of {self.target_link}', + "icon": 'fa-radiation-alt', + "color": 'bg-success' + }, + 'unpin_comment': { + "str": 'unpinned {self.target_link}', + "icon": 'fa-thumbtack fa-rotate--45', + "color": 'bg-muted' + }, + 'unpin_post': { + "str": 'unpinned post {self.target_link}', + "icon": 'fa-thumbtack fa-rotate--45', + "color": 'bg-muted' + }, + 'unset_nsfw': { + "str": 'unset {self.target_link} as +18', + "icon": 'fa-eye-evil', + "color": 'bg-success' + }, + 'unset_nsfw_comment': { + "str": 'unset {self.target_link} as +18', + "icon": 'fa-eye-evil', + "color": 'bg-success' + }, + 'unshadowban': { + "str": 'unshadowbanned {self.target_link}', + "icon": 'fa-eye', + "color": 'bg-success' + }, + 'update_hat': { + "str": 'updated hat image', + "icon": 'fa-hat-cowboy', + "color": 'bg-success' + }, + 'update_marsey': { + "str": 'updated marsey', + "icon": 'fa-cat', + "color": 'bg-success' + }, +} + +MODACTION_PRIVILEGED_TYPES = {'shadowban', 'unshadowban', + 'mod_mute_user', 'mod_unmute_user', + 'link_accounts', 'delink_accounts'} +MODACTION_TYPES_FILTERED = deepcopy({t:v for t,v in MODACTION_TYPES.items() + if not t in MODACTION_PRIVILEGED_TYPES}) diff --git a/files/helpers/config/subaction_types.py b/files/helpers/config/subaction_types.py new file mode 100644 index 000000000..6f8061e40 --- /dev/null +++ b/files/helpers/config/subaction_types.py @@ -0,0 +1,117 @@ +SUBACTION_TYPES = { + 'exile_user': { + "str": 'exiled user {self.target_link}', + "icon": 'fa-user-slash', + "color": 'bg-danger' + }, + 'unexile_user': { + "str": 'unexiled user {self.target_link}', + "icon": 'fa-user', + "color": 'bg-success' + }, + 'make_mod': { + "str": 'made {self.target_link} a mod', + "icon": 'fa-user-crown', + "color": 'bg-success' + }, + 'remove_mod': { + "str": 'removed {self.target_link} as mod', + "icon": 'fa-user-crown', + "color": 'bg-danger' + }, + 'kick_post': { + "str": 'kicked post {self.target_link}', + "icon": 'fa-feather-alt', + "color": 'bg-danger' + }, + 'move_chudrama': { + "str": 'moved post {self.target_link} to /h/chudrama', + "icon": 'fa-feather-alt', + "color": 'bg-danger' + }, + 'flair_post': { + "str": 'set a flair on {self.target_link}', + "icon": 'fa-tag', + "color": 'bg-primary' + }, + 'edit_sidebar': { + "str": 'edited the sidebar', + "icon": 'fa-columns', + "color": 'bg-primary' + }, + 'edit_css': { + "str": 'edited the css', + "icon": 'fa-css3-alt', + "color": 'bg-primary' + }, + 'upload_banner': { + "str": 'uploaded a banner', + "icon": 'fa-landscape', + "color": 'bg-primary' + }, + 'delete_banner': { + "str": 'deleted banner', + "icon": 'fa-image-slash', + "color": 'bg-danger', + }, + 'change_sidebar_image': { + "str": 'changed the sidebar image', + "icon": 'fa-image', + "color": 'bg-primary' + }, + 'change_marsey': { + "str": 'changed the hole marsey', + "icon": 'fa-cat', + "color": 'bg-primary' + }, + 'pin_post': { + "str": 'pinned post {self.target_link}', + "icon": 'fa-thumbtack fa-rotate--45', + "color": 'bg-success' + }, + 'unpin_post': { + "str": 'unpinned post {self.target_link}', + "icon": 'fa-thumbtack fa-rotate--45', + "color": 'bg-muted' + }, + 'pin_comment': { + "str": 'pinned {self.target_link}', + "icon": 'fa-thumbtack fa-rotate--45', + "color": 'bg-success' + }, + 'unpin_comment': { + "str": 'unpinned {self.target_link}', + "icon": 'fa-thumbtack fa-rotate--45', + "color": 'bg-muted' + }, + 'enable_stealth': { + "str": 'enabled stealth mode', + "icon": 'fa-user-ninja', + "color": 'bg-primary' + }, + 'disable_stealth': { + "str": 'disabled stealth mode', + "icon": 'fa-user-ninja', + "color": 'bg-muted' + }, + 'set_nsfw': { + "str": 'set nsfw on post {self.target_link}', + "icon": 'fa-eye-evil', + "color": 'bg-danger' + }, + 'unset_nsfw': { + "str": 'un-set nsfw on post {self.target_link}', + "icon": 'fa-eye-evil', + "color": 'bg-success' + }, + 'set_nsfw_comment': { + "str": 'set nsfw on a {self.target_link}', + "icon": 'fa-eye-evil', + "color": 'bg-danger' + }, + 'unset_nsfw_comment': { + "str": 'un-set nsfw on a {self.target_link}', + "icon": 'fa-eye-evil', + "color": 'bg-success' + }, +} diff --git a/files/helpers/const_stateful.py b/files/helpers/const_stateful.py index 71b11f152..1a90c6336 100644 --- a/files/helpers/const_stateful.py +++ b/files/helpers/const_stateful.py @@ -3,7 +3,7 @@ from os import path from sqlalchemy.orm import scoped_session from files.classes import Marsey -from files.helpers.const import SITE_NAME +from files.helpers.config.const import SITE_NAME marseys_const = [] marseys_const2 = [] diff --git a/files/helpers/cron.py b/files/helpers/cron.py index 816cc7290..e2889caf4 100644 --- a/files/helpers/cron.py +++ b/files/helpers/cron.py @@ -13,7 +13,7 @@ import files.routes.streamers as route_streamers from files.__main__ import cache from files.classes import * from files.helpers.alerts import send_repeatable_notification -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import * from files.helpers.lottery import check_if_end_lottery_task from files.helpers.roulette import spin_roulette_wheel diff --git a/files/helpers/discord.py b/files/helpers/discord.py index 1e03f2a5d..cf944322d 100644 --- a/files/helpers/discord.py +++ b/files/helpers/discord.py @@ -1,6 +1,6 @@ import requests -from .const import * +from .config.const import * def discord_message_send(channel_id, message): requests.post( diff --git a/files/helpers/get.py b/files/helpers/get.py index ce6d94d5b..ea1d9ff8b 100644 --- a/files/helpers/get.py +++ b/files/helpers/get.py @@ -5,7 +5,7 @@ from sqlalchemy import and_, any_, or_ from sqlalchemy.orm import joinedload, selectinload, Query from files.classes import Comment, CommentVote, Hat, Sub, Submission, User, UserBlock, Vote -from files.helpers.const import AUTOJANNY_ID +from files.helpers.config.const import AUTOJANNY_ID def sanitize_username(username:str) -> str: if not username: return username diff --git a/files/helpers/logging.py b/files/helpers/logging.py index e6d84f68f..63b84d039 100644 --- a/files/helpers/logging.py +++ b/files/helpers/logging.py @@ -1,4 +1,4 @@ -from files.helpers.const import LOG_DIRECTORY +from files.helpers.config.const import LOG_DIRECTORY def log_file(log_str:str, log_filename="rdrama.log"): ''' diff --git a/files/helpers/lottery.py b/files/helpers/lottery.py index 3acd09374..5ef82527a 100644 --- a/files/helpers/lottery.py +++ b/files/helpers/lottery.py @@ -8,7 +8,7 @@ from files.classes.lottery import Lottery from files.helpers.alerts import * from files.helpers.useractions import * -from .const import * +from .config.const import * LOTTERY_WINNER_BADGE_ID = 137 diff --git a/files/helpers/mail.py b/files/helpers/mail.py index 9baf264b4..6c2ae4e31 100644 --- a/files/helpers/mail.py +++ b/files/helpers/mail.py @@ -2,7 +2,7 @@ import requests import time from files.helpers.security import * -from files.helpers.const import EMAIL, MAILGUN_KEY +from files.helpers.config.const import EMAIL, MAILGUN_KEY from urllib.parse import quote diff --git a/files/helpers/media.py b/files/helpers/media.py index ef6e23477..ff7f87152 100644 --- a/files/helpers/media.py +++ b/files/helpers/media.py @@ -16,7 +16,7 @@ from sqlalchemy.orm.session import Session from files.classes.media import * from files.helpers.cloudflare import purge_files_in_cache -from .const import * +from .config.const import * def process_files(files, v): body = '' @@ -124,8 +124,6 @@ def process_video(file, v): return new - - def process_image(filename:str, v, resize=0, trim=False, uploader_id:Optional[int]=None, db=None): # thumbnails are processed in a thread and not in the request context # if an image is too large or webp conversion fails, it'll crash diff --git a/files/helpers/offsitementions.py b/files/helpers/offsitementions.py index a1d3faeff..e1c6f57db 100644 --- a/files/helpers/offsitementions.py +++ b/files/helpers/offsitementions.py @@ -7,7 +7,7 @@ from flask_caching import Cache from flask import g from sqlalchemy import or_ -import files.helpers.const as const +import files.helpers.config.const as const from files.classes.badges import Badge from files.classes.comment import Comment from files.classes.user import User diff --git a/files/helpers/regex.py b/files/helpers/regex.py index c4569c45e..c13bfbf14 100644 --- a/files/helpers/regex.py +++ b/files/helpers/regex.py @@ -3,7 +3,7 @@ import re from random import choice, choices from typing import List, Optional, Union -from .const import * +from .config.const import * valid_username_chars = 'a-zA-Z0-9_\-' valid_username_regex = re.compile("^[a-zA-Z0-9_\-]{3,25}$", flags=re.A) diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 03386de3d..f7562a03b 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -14,7 +14,7 @@ from bs4 import BeautifulSoup from mistletoe import markdown from files.classes.domains import BannedDomain -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.const_stateful import * from files.helpers.regex import * from .get import * diff --git a/files/helpers/security.py b/files/helpers/security.py index eec4fc842..76e3ab8b1 100644 --- a/files/helpers/security.py +++ b/files/helpers/security.py @@ -1,6 +1,6 @@ from werkzeug.security import * -from .const import * +from .config.const import * def generate_hash(string): msg = bytes(string, "utf-16") diff --git a/files/helpers/settings.py b/files/helpers/settings.py index 2f713fbe3..207df0ddd 100644 --- a/files/helpers/settings.py +++ b/files/helpers/settings.py @@ -4,7 +4,7 @@ import os import gevent import gevent_inotifyx as inotify -from files.helpers.const import SETTINGS_FILENAME +from files.helpers.config.const import SETTINGS_FILENAME _SETTINGS = { "bots": True, diff --git a/files/helpers/slots.py b/files/helpers/slots.py index ef6fc0891..a2d768f9c 100644 --- a/files/helpers/slots.py +++ b/files/helpers/slots.py @@ -9,7 +9,7 @@ from files.classes.comment import Comment from files.classes.user import User from files.helpers.casino import distribute_wager_badges -from .const import * +from .config.const import * minimum_bet = 5 maximum_bet = INFINITY diff --git a/files/helpers/sorting_and_time.py b/files/helpers/sorting_and_time.py index 86b09cdd5..a1ccf259a 100644 --- a/files/helpers/sorting_and_time.py +++ b/files/helpers/sorting_and_time.py @@ -3,7 +3,7 @@ from typing import Optional from sqlalchemy.sql import func -from files.helpers.const import * +from files.helpers.config.const import * def apply_time_filter(t, objects, cls): now = int(time.time()) diff --git a/files/helpers/stats.py b/files/helpers/stats.py index d390558e2..166ddba92 100644 --- a/files/helpers/stats.py +++ b/files/helpers/stats.py @@ -10,7 +10,7 @@ from files.classes.comment import Comment from files.classes.votes import Vote, CommentVote from files.classes.marsey import Marsey from files.classes.award import AwardRelationship -from files.helpers.const import * +from files.helpers.config.const import * def generate_charts_task(site): chart(kind='daily', site=site) diff --git a/files/helpers/treasure.py b/files/helpers/treasure.py index e7a2e51ae..856e01622 100644 --- a/files/helpers/treasure.py +++ b/files/helpers/treasure.py @@ -1,7 +1,7 @@ from math import floor from random import randint -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.lottery import * special_min = 100 diff --git a/files/routes/__init__.py b/files/routes/__init__.py index 4690a242f..e29775253 100644 --- a/files/routes/__init__.py +++ b/files/routes/__init__.py @@ -1,5 +1,5 @@ # import constants then... -from files.helpers.const import FEATURES +from files.helpers.config.const import FEATURES # import flask then... from flask import g, request, render_template, make_response, redirect, jsonify, send_file diff --git a/files/routes/admin.py b/files/routes/admin.py index 30a449063..09336cc4f 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -8,7 +8,7 @@ from files.classes import * from files.helpers.actions import * from files.helpers.alerts import * from files.helpers.cloudflare import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import * from files.helpers.media import * from files.helpers.sanitize import * @@ -45,7 +45,7 @@ def loggedout_list(v): @app.get('/admin/merge//') @admin_level_required(PERMS['USER_MERGE']) -def merge(v, id1, id2): +def merge(v:User, id1, id2): if v.id != AEVANN_ID: abort(403) if time.time() - session.get('verified', 0) > 3: @@ -107,7 +107,7 @@ def merge(v, id1, id2): @app.get('/admin/merge_all/') @admin_level_required(PERMS['USER_MERGE']) -def merge_all(v, id): +def merge_all(v:User, id): if v.id != AEVANN_ID: abort(403) if time.time() - session.get('verified', 0) > 3: @@ -191,7 +191,7 @@ def edit_rules_post(v): @app.post("/@/make_admin") @admin_level_required(PERMS['ADMIN_ADD']) -def make_admin(v, username): +def make_admin(v:User, username): if SITE == 'rdrama.net': abort(403) user = get_user(username) @@ -211,7 +211,7 @@ def make_admin(v, username): @app.post("/@/remove_admin") @admin_level_required(PERMS['ADMIN_REMOVE']) -def remove_admin(v, username): +def remove_admin(v:User, username): user = get_user(username) if user.id == v.id: abort(403, "You can't remove yourself JC") @@ -231,7 +231,7 @@ def remove_admin(v, username): @app.post("/distribute/") @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @admin_level_required(PERMS['POST_BETS_DISTRIBUTE']) -def distribute(v, option_id): +def distribute(v:User, option_id): autojanny = get_account(AUTOJANNY_ID) if autojanny.coins == 0: abort(400, "@AutoJanny has 0 coins") @@ -287,7 +287,7 @@ def distribute(v, option_id): @app.post("/@/revert_actions") @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @admin_level_required(PERMS['ADMIN_ACTIONS_REVERT']) -def revert_actions(v, username): +def revert_actions(v:User, username): user = get_user(username) ma = ModAction( @@ -453,7 +453,7 @@ def admin_git_head(): @app.post("/admin/site_settings/") @admin_level_required(PERMS['SITE_SETTINGS']) -def change_settings(v, setting): +def change_settings(v:User, setting): if setting not in get_settings().keys(): abort(404, f"Setting '{setting}' not found") val = toggle_setting(setting) @@ -745,14 +745,14 @@ def alt_votes_get(v): @app.get("/@/alts/") @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @admin_level_required(PERMS['USER_LINK']) -def admin_view_alts(v, username=None): +def admin_view_alts(v:User, username=None): u = get_user(username or request.values.get('username'), graceful=True) return render_template('admin/alts.html', v=v, u=u, alts=u.alts_unique if u else None) @app.post('/@/alts/') @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @admin_level_required(PERMS['USER_LINK']) -def admin_add_alt(v, username): +def admin_add_alt(v:User, username): user1 = get_user(username) user2 = get_user(request.values.get('other_username')) if user1.id == user2.id: abort(400, "Can't add the same account as alts of each other") @@ -788,7 +788,7 @@ def admin_add_alt(v, username): @app.route('/@/alts//deleted', methods=["PUT", "DELETE"]) @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @admin_level_required(PERMS['USER_LINK']) -def admin_delink_relink_alt(v, username, other): +def admin_delink_relink_alt(v:User, username, other): is_delinking = request.method == 'PUT' # we're adding the 'deleted' state if a PUT request user1 = get_user(username) user2 = get_account(other) @@ -1143,7 +1143,7 @@ def unban_user(user_id, v): @app.post("/mute_user/") @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @admin_level_required(PERMS['USER_BAN']) -def mute_user(v, user_id): +def mute_user(v:User, user_id): user = get_account(user_id) if not user.is_muted: @@ -1162,7 +1162,7 @@ def mute_user(v, user_id): @app.post("/unmute_user/") @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @admin_level_required(PERMS['USER_BAN']) -def unmute_user(v, user_id): +def unmute_user(v:User, user_id): user = get_account(user_id) if user.is_muted: @@ -1495,7 +1495,7 @@ def ban_domain(v): @app.post("/admin/unban_domain/") @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @admin_level_required(PERMS['DOMAINS_BAN']) -def unban_domain(v, domain): +def unban_domain(v:User, domain): existing = g.db.get(BannedDomain, domain) if not existing: abort(400, 'Domain is not banned!') diff --git a/files/routes/allroutes.py b/files/routes/allroutes.py index bd8ef1a9a..34b1d8052 100644 --- a/files/routes/allroutes.py +++ b/files/routes/allroutes.py @@ -1,6 +1,6 @@ import secrets -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.settings import get_setting from files.helpers.cloudflare import CLOUDFLARE_AVAILABLE from files.routes.wrappers import * diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py index 3f2c9c46e..967e30c63 100644 --- a/files/routes/asset_submissions.py +++ b/files/routes/asset_submissions.py @@ -5,7 +5,7 @@ from files.classes.marsey import Marsey from files.classes.hats import Hat, HatDef from files.classes.mod_logs import ModAction from files.helpers.cloudflare import purge_files_in_cache -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import * from files.helpers.media import * from files.helpers.useractions import * diff --git a/files/routes/awards.py b/files/routes/awards.py index 05b8ef4f3..108e72129 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -7,7 +7,8 @@ from files.classes.award import AwardRelationship from files.classes.userblock import UserBlock from files.helpers.actions import * from files.helpers.alerts import * -from files.helpers.const import * +from files.helpers.config.const import * +from files.helpers.config.awards import AWARDS_ENABLED, HOUSE_AWARDS from files.helpers.get import * from files.helpers.marsify import marsify from files.helpers.owoify import owoify @@ -23,7 +24,7 @@ from .front import frontlist @app.get("/settings/shop") @auth_required def shop(v:User): - AWARDS = deepcopy(AWARDS2) + AWARDS = deepcopy(AWARDS_ENABLED) if v.house: AWARDS[v.house] = deepcopy(HOUSE_AWARDS[v.house]) @@ -53,7 +54,7 @@ def buy(v:User, award): if award == 'ghost' and v.admin_level < PERMS['BUY_GHOST_AWARD']: abort(403, "Only admins can buy this award") - AWARDS = deepcopy(AWARDS2) + AWARDS = deepcopy(AWARDS_ENABLED) if v.house: AWARDS[v.house] = HOUSE_AWARDS[v.house] @@ -139,7 +140,7 @@ def award_thing(v, thing_type, id): kind = request.values.get("kind", "").strip() - AWARDS = deepcopy(AWARDS2) + AWARDS = deepcopy(AWARDS_ENABLED) if v.house: AWARDS[v.house] = HOUSE_AWARDS[v.house] diff --git a/files/routes/casino.py b/files/routes/casino.py index a55f39874..c66722c2f 100644 --- a/files/routes/casino.py +++ b/files/routes/casino.py @@ -1,7 +1,7 @@ from files.classes.casino_game import CASINO_GAME_KINDS from files.helpers.alerts import * from files.helpers.casino import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import * from files.helpers.lottery import * from files.helpers.roulette import * diff --git a/files/routes/chat.py b/files/routes/chat.py index d3b0bd1f0..678e4e8a7 100644 --- a/files/routes/chat.py +++ b/files/routes/chat.py @@ -6,7 +6,7 @@ from flask_socketio import SocketIO, emit from files.helpers.actions import * from files.helpers.alerts import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.regex import * from files.helpers.sanitize import sanitize from files.routes.wrappers import * diff --git a/files/routes/comments.py b/files/routes/comments.py index 587b66379..257e8ee70 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -9,7 +9,7 @@ from files.classes import * from files.helpers.actions import * from files.helpers.alerts import * from files.helpers.cloudflare import purge_files_in_cache -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import * from files.helpers.marsify import marsify from files.helpers.media import * diff --git a/files/routes/errors.py b/files/routes/errors.py index 9e5e34da3..7820c5f08 100644 --- a/files/routes/errors.py +++ b/files/routes/errors.py @@ -3,7 +3,7 @@ from urllib.parse import quote, urlencode from flask import redirect, render_template, request, session, g -from files.helpers.const import ERROR_MARSEYS, ERROR_MSGS, ERROR_TITLES, WERKZEUG_ERROR_DESCRIPTIONS, is_site_url +from files.helpers.config.const import ERROR_MARSEYS, ERROR_MSGS, ERROR_TITLES, WERKZEUG_ERROR_DESCRIPTIONS, is_site_url from files.helpers.settings import get_setting from files.__main__ import app diff --git a/files/routes/front.py b/files/routes/front.py index d3c5b5613..33bcc4934 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -4,7 +4,7 @@ from sqlalchemy import or_, not_ from files.classes.submission import Submission from files.classes.votes import Vote from files.helpers.awards import award_timers -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import * from files.helpers.sorting_and_time import * from files.routes.wrappers import * diff --git a/files/routes/giphy.py b/files/routes/giphy.py index c286c71a5..c3aff5d2b 100644 --- a/files/routes/giphy.py +++ b/files/routes/giphy.py @@ -1,6 +1,6 @@ import requests -from files.helpers.const import * +from files.helpers.config.const import * from files.routes.wrappers import * from files.__main__ import app diff --git a/files/routes/hats.py b/files/routes/hats.py index e6e514ca5..4c1b30593 100644 --- a/files/routes/hats.py +++ b/files/routes/hats.py @@ -2,7 +2,7 @@ from sqlalchemy import func from files.classes.hats import * from files.helpers.alerts import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.useractions import * from files.routes.wrappers import * from files.__main__ import app, limiter diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index 066a37510..0a1124403 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -9,7 +9,7 @@ from jinja2 import pass_context from files.classes.user import User from files.helpers.assetcache import assetcache_path -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.settings import get_settings from files.helpers.sorting_and_time import make_age_string from files.routes.routehelpers import get_formkey diff --git a/files/routes/login.py b/files/routes/login.py index 20e92c00f..cd288772a 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -6,7 +6,7 @@ import requests from files.__main__ import app, cache, get_CF, limiter from files.classes.follows import Follow from files.helpers.actions import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.settings import get_setting from files.helpers.get import * from files.helpers.mail import send_mail, send_verification_email diff --git a/files/routes/lottery.py b/files/routes/lottery.py index 707dd83af..5cdae2b2d 100644 --- a/files/routes/lottery.py +++ b/files/routes/lottery.py @@ -1,5 +1,5 @@ from files.helpers.alerts import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import * from files.helpers.lottery import * from files.routes.wrappers import * diff --git a/files/routes/mail.py b/files/routes/mail.py index c02030091..311d68101 100644 --- a/files/routes/mail.py +++ b/files/routes/mail.py @@ -1,7 +1,7 @@ import time from files.classes import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import * from files.helpers.mail import * from files.helpers.useractions import * diff --git a/files/routes/notifications.py b/files/routes/notifications.py index c66adb425..1f55ad932 100644 --- a/files/routes/notifications.py +++ b/files/routes/notifications.py @@ -4,7 +4,7 @@ from sqlalchemy.sql.expression import not_, and_, or_ from files.classes.mod_logs import ModAction from files.classes.sub_logs import SubAction -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import * from files.routes.wrappers import * from files.__main__ import app diff --git a/files/routes/oauth.py b/files/routes/oauth.py index c095d4531..50432ef9d 100644 --- a/files/routes/oauth.py +++ b/files/routes/oauth.py @@ -2,7 +2,7 @@ import sqlalchemy.exc from files.classes import * from files.helpers.alerts import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import * from files.routes.wrappers import * from files.__main__ import app, limiter diff --git a/files/routes/polls.py b/files/routes/polls.py index 7aa52d219..d714629dd 100644 --- a/files/routes/polls.py +++ b/files/routes/polls.py @@ -1,5 +1,5 @@ from files.classes import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import * from files.routes.wrappers import * from files.__main__ import app diff --git a/files/routes/posts.py b/files/routes/posts.py index 71e299fce..baa08b93b 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -15,7 +15,7 @@ from files.__main__ import app, cache, limiter from files.classes import * from files.helpers.actions import * from files.helpers.alerts import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.discord import * from files.helpers.get import * from files.helpers.regex import * diff --git a/files/routes/routehelpers.py b/files/routes/routehelpers.py index 0848d7917..71fa1ad08 100644 --- a/files/routes/routehelpers.py +++ b/files/routes/routehelpers.py @@ -7,7 +7,7 @@ from typing import Optional, Union from flask import g, session from files.classes import Alt, Comment, User, Submission -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.security import generate_hash, validate_hash def get_raw_formkey(u:User): diff --git a/files/routes/settings.py b/files/routes/settings.py index 9867a118e..9203d7096 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -9,7 +9,7 @@ import youtube_dl from files.helpers.actions import * from files.helpers.alerts import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import * from files.helpers.mail import * from files.helpers.media import process_files, process_image diff --git a/files/routes/static.py b/files/routes/static.py index 02bf3808b..056826d53 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -7,11 +7,12 @@ from files.helpers.media import process_files import files.helpers.stats as statshelper from files.classes.award import AWARDS from files.classes.badges import Badge, BadgeDef -from files.classes.mod_logs import ModAction, ACTIONTYPES, ACTIONTYPES2 +from files.classes.mod_logs import ModAction from files.classes.userblock import UserBlock from files.helpers.actions import * from files.helpers.alerts import * -from files.helpers.const import * +from files.helpers.config.const import * +from files.helpers.config.modaction_types import MODACTION_TYPES, MODACTION_TYPES_FILTERED, MODACTION_PRIVILEGED_TYPES from files.routes.wrappers import * from files.__main__ import app, cache, limiter @@ -135,8 +136,8 @@ def log(v:User): kind = request.values.get("kind") - if v and v.admin_level >= PERMS['USER_SHADOWBAN']: types = ACTIONTYPES - else: types = ACTIONTYPES2 + if v and v.admin_level >= PERMS['USER_SHADOWBAN']: types = MODACTION_TYPES + else: types = MODACTION_TYPES_FILTERED if kind and kind not in types: kind = None @@ -144,11 +145,7 @@ def log(v:User): else: actions = g.db.query(ModAction) if not (v and v.admin_level >= PERMS['USER_SHADOWBAN']): - actions = actions.filter(ModAction.kind.notin_([ - "shadowban","unshadowban", - "mod_mute_user","mod_unmute_user", - "link_accounts","delink_accounts", - ])) + actions = actions.filter(ModAction.kind.notin_(MODACTION_PRIVILEGED_TYPES)) if admin_id: actions = actions.filter_by(user_id=admin_id) @@ -180,8 +177,8 @@ def log_item(id, v): admins = [x[0] for x in g.db.query(User.username).filter(User.admin_level >= PERMS['ADMIN_MOP_VISIBLE']).all()] - if v and v.admin_level >= PERMS['USER_SHADOWBAN']: types = ACTIONTYPES - else: types = ACTIONTYPES2 + if v and v.admin_level >= PERMS['USER_SHADOWBAN']: types = MODACTION_TYPES + else: types = MODACTION_TYPES_FILTERED return render_template("log.html", v=v, actions=[action], next_exists=False, page=1, action=action, admins=admins, types=types, single_user_url='admin') diff --git a/files/routes/streamers.py b/files/routes/streamers.py index 9fd5a051c..be7845294 100644 --- a/files/routes/streamers.py +++ b/files/routes/streamers.py @@ -4,7 +4,7 @@ import requests from files.classes.streamers import Streamer from files.helpers.alerts import send_repeatable_notification -from files.helpers.const import * +from files.helpers.config.const import * from files.routes.wrappers import * from files.__main__ import app, cache diff --git a/files/routes/subs.py b/files/routes/subs.py index ffa994da0..a1e7045fd 100644 --- a/files/routes/subs.py +++ b/files/routes/subs.py @@ -9,10 +9,9 @@ from files.routes.wrappers import * from .front import frontlist from files.__main__ import app, cache, limiter - @app.post("/exile/post/") @is_not_permabanned -def exile_post(v, pid): +def exile_post(v:User, pid): if v.shadowbanned: return {"error": "Internal Server Error"}, 500 p = get_post(pid) sub = p.sub @@ -41,11 +40,9 @@ def exile_post(v, pid): return {"message": f"@{u.username} has been exiled from /h/{sub} successfully!"} - - @app.post("/exile/comment/") @is_not_permabanned -def exile_comment(v, cid): +def exile_comment(v:User, cid): if v.shadowbanned: return {"error": "Internal Server Error"}, 500 c = get_comment(cid) sub = c.post.sub @@ -74,10 +71,9 @@ def exile_comment(v, cid): return {"message": f"@{u.username} has been exiled from /h/{sub} successfully!"} - @app.post("/h//unexile/") @is_not_permabanned -def unexile(v, sub, uid): +def unexile(v:User, sub, uid): u = get_account(uid) if not v.mods(sub): abort(403) @@ -103,22 +99,17 @@ def unexile(v, sub, uid): return redirect(f'/h/{sub}/exilees') - - @app.post("/h//block") @auth_required def block_sub(v:User, sub): sub = get_sub_by_name(sub).name existing = g.db.query(SubBlock).filter_by(user_id=v.id, sub=sub).one_or_none() - if not existing: block = SubBlock(user_id=v.id, sub=sub) g.db.add(block) cache.delete_memoized(frontlist) - return {"message": f"/h/{sub} blocked successfully!"} - @app.post("/h//unblock") @auth_required def unblock_sub(v:User, sub): @@ -134,18 +125,15 @@ def unblock_sub(v:User, sub): return {"message": f"/h/{sub.name} unblocked successfully!"} - @app.post("/h//subscribe") @auth_required def subscribe_sub(v:User, sub): sub = get_sub_by_name(sub).name existing = g.db.query(SubJoin).filter_by(user_id=v.id, sub=sub).one_or_none() - if not existing: subscribe = SubJoin(user_id=v.id, sub=sub) g.db.add(subscribe) cache.delete_memoized(frontlist) - return {"message": f"/h/{sub} unblocked successfully!"} @app.post("/h//unsubscribe") @@ -153,11 +141,9 @@ def subscribe_sub(v:User, sub): def unsubscribe_sub(v:User, sub): sub = get_sub_by_name(sub).name subscribe = g.db.query(SubJoin).filter_by(user_id=v.id, sub=sub).one_or_none() - if subscribe: g.db.delete(subscribe) cache.delete_memoized(frontlist) - return {"message": f"/h/{sub} blocked successfully!"} @app.post("/h//follow") @@ -241,7 +227,7 @@ def sub_followers(v:User, sub): @limiter.limit("1/second;30/day") @is_not_permabanned @ratelimit_user("1/second;30/day") -def add_mod(v, sub): +def add_mod(v:User, sub): if SITE_NAME == 'WPD': abort(403) sub = get_sub_by_name(sub).name if not v.mods(sub): abort(403) @@ -275,10 +261,9 @@ def add_mod(v, sub): return redirect(f'/h/{sub}/mods') - @app.post("/h//remove_mod") @is_not_permabanned -def remove_mod(v, sub): +def remove_mod(v:User, sub): sub = get_sub_by_name(sub).name if not v.mods(sub): abort(403) @@ -358,7 +343,7 @@ def create_sub2(v): @app.post("/kick/") @is_not_permabanned -def kick(v, pid): +def kick(v:User, pid): post = get_post(pid) if not post.sub: abort(403) @@ -389,7 +374,7 @@ def kick(v, pid): @app.get('/h//settings') @is_not_permabanned -def sub_settings(v, sub): +def sub_settings(v:User, sub): sub = get_sub_by_name(sub) if not v.mods(sub.name): abort(403) return render_template('sub/settings.html', v=v, sidebar=sub.sidebar, sub=sub) @@ -399,7 +384,7 @@ def sub_settings(v, sub): @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @is_not_permabanned @ratelimit_user() -def post_sub_sidebar(v, sub): +def post_sub_sidebar(v:User, sub): sub = get_sub_by_name(sub) if not v.mods(sub.name): abort(403) if v.shadowbanned: return redirect(f'/h/{sub}/settings') @@ -424,7 +409,7 @@ def post_sub_sidebar(v, sub): @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @is_not_permabanned @ratelimit_user() -def post_sub_css(v, sub): +def post_sub_css(v:User, sub): sub = get_sub_by_name(sub) css = request.values.get('css', '').strip() @@ -452,7 +437,6 @@ def post_sub_css(v, sub): return redirect(f'/h/{sub}/settings') - @app.get("/h//css") def get_sub_css(sub): sub = g.db.query(Sub.css).filter_by(name=sub.strip().lower()).one_or_none() @@ -461,13 +445,12 @@ def get_sub_css(sub): resp.headers.add("Content-Type", "text/css") return resp - -@app.post("/h//banner") +@app.post("/h//settings/banners/") @limiter.limit("1/second;10/day") @is_not_permabanned @ratelimit_user("1/second;10/day") -def sub_banner(v, sub): - if g.is_tor: abort(403, "Image uploads are not allowed through TOR.") +def upload_sub_banner(v:User, sub:str): + if g.is_tor: abort(403, "Image uploads are not allowed through Tor") sub = get_sub_by_name(sub) if not v.mods(sub.name): abort(403) @@ -479,26 +462,81 @@ def sub_banner(v, sub): file.save(name) bannerurl = process_image(name, v, resize=1200) - if bannerurl: - if sub.bannerurl: - os.remove(sub.bannerurl) - sub.bannerurl = bannerurl - g.db.add(sub) + sub.bannerurls.append(bannerurl) + + g.db.add(sub) ma = SubAction( sub=sub.name, - kind='change_banner', + kind='upload_banner', user_id=v.id ) g.db.add(ma) return redirect(f'/h/{sub}/settings') +@app.delete("/h//settings/banners/") +@limiter.limit("1/2 second;30/day") +@is_not_permabanned +@ratelimit_user("1/2 second;30/day") +def delete_sub_banner(v:User, sub:str, index:int): + sub = get_sub_by_name(sub) + if not v.mods(sub.name): abort(403) + if v.shadowbanned: return redirect(f'/h/{sub}/settings') + + if not sub.bannerurls: + abort(404, f"Banner not found (/h/{sub.name} has no banners)") + if index < 0 or index >= len(sub.bannerurls): + abort(404, f'Banner not found (banner index {index} is not between 0 and {len(sub.bannerurls)})') + banner = sub.bannerurls[index] + try: + os.remove(banner) + except FileNotFoundError: + pass + del sub.bannerurls[index] + g.db.add(sub) + + ma = SubAction( + sub=sub.name, + kind='delete_banner', + _note=index, + user_id=v.id + ) + g.db.add(ma) + + return {"message": f"Deleted banner {index} from /h/{sub} successfully"} + +@app.delete("/h//settings/banners/") +@limiter.limit("1/10 second;30/day") +@is_not_permabanned +@ratelimit_user("1/10 second;30/day") +def delete_all_sub_banners(v:User, sub:str): + sub = get_sub_by_name(sub) + if not v.mods(sub.name): abort(403) + if v.shadowbanned: return redirect(f'/h/{sub}/settings') + for banner in sub.banner_urls: + try: + os.remove(banner) + except FileNotFoundError: + pass + sub.bannerurls = [] + g.db.add(sub) + + ma = SubAction( + sub=sub.name, + kind='delete_banner', + _note='all', + user_id=v.id + ) + g.db.add(ma) + + return {"message": f"Deleted all banners from /h/{sub} successfully"} + @app.post("/h//sidebar_image") @limiter.limit("1/second;10/day") @is_not_permabanned @ratelimit_user("1/second;10/day") -def sub_sidebar(v, sub): +def sub_sidebar(v:User, sub): if g.is_tor: abort(403, "Image uploads are not allowed through TOR.") sub = get_sub_by_name(sub) @@ -529,7 +567,7 @@ def sub_sidebar(v, sub): @limiter.limit("1/second;10/day") @is_not_permabanned @ratelimit_user("1/second;10/day") -def sub_marsey(v, sub): +def sub_marsey(v:User, sub): if g.is_tor: abort(403, "Image uploads are not allowed through TOR.") sub = get_sub_by_name(sub) @@ -565,7 +603,7 @@ def subs(v:User): @app.post("/hole_pin/") @is_not_permabanned -def hole_pin(v, pid): +def hole_pin(v:User, pid): p = get_post(pid) if not p.sub: abort(403) @@ -591,7 +629,7 @@ def hole_pin(v, pid): @app.post("/hole_unpin/") @is_not_permabanned -def hole_unpin(v, pid): +def hole_unpin(v:User, pid): p = get_post(pid) if not p.sub: abort(403) @@ -618,7 +656,7 @@ def hole_unpin(v, pid): @app.post('/h//stealth') @is_not_permabanned -def sub_stealth(v, sub): +def sub_stealth(v:User, sub): sub = get_sub_by_name(sub) if sub.name == 'braincels': abort(403) if not v.mods(sub.name): abort(403) @@ -716,7 +754,7 @@ def hole_log(v:User, sub): kind = request.values.get("kind") - types = ACTIONTYPES + types = SUBACTION_TYPES if kind and kind not in types: kind = None @@ -758,6 +796,6 @@ def hole_log_item(id, v, sub): mods = [x[0] for x in g.db.query(Mod.user_id).filter_by(sub=sub.name).all()] mods = [x[0] for x in g.db.query(User.username).filter(User.id.in_(mods)).order_by(User.username).all()] - types = ACTIONTYPES + types = SUBACTION_TYPES return render_template("log.html", v=v, actions=[action], next_exists=False, page=1, action=action, admins=mods, types=types, sub=sub, single_user_url='mod') diff --git a/files/routes/users.py b/files/routes/users.py index 7afcce757..e9163250a 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -16,7 +16,7 @@ from files.classes.transactions import * from files.classes.views import * from files.helpers.actions import execute_blackjack, execute_under_siege from files.helpers.alerts import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.mail import * from files.helpers.sanitize import * from files.helpers.sorting_and_time import * diff --git a/files/routes/votes.py b/files/routes/votes.py index ee2e0955a..37f3bd924 100644 --- a/files/routes/votes.py +++ b/files/routes/votes.py @@ -1,5 +1,5 @@ from files.classes import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import * from files.routes.wrappers import * from files.__main__ import app, limiter diff --git a/files/routes/wrappers.py b/files/routes/wrappers.py index 9169ccb7d..fb7998c78 100644 --- a/files/routes/wrappers.py +++ b/files/routes/wrappers.py @@ -3,7 +3,7 @@ from flask import g, request, session from files.classes.clients import ClientAuth from files.helpers.alerts import * -from files.helpers.const import * +from files.helpers.config.const import * from files.helpers.get import get_account from files.helpers.logging import log_file from files.helpers.settings import get_setting diff --git a/files/templates/admin/badge_admin.html b/files/templates/admin/badge_admin.html index cf42da8de..62cd26d4d 100644 --- a/files/templates/admin/badge_admin.html +++ b/files/templates/admin/badge_admin.html @@ -2,28 +2,9 @@ {% block pagetitle %}{{"Badge Grant" if grant else "Badge Remove"}}{% endblock %} {% block pagetype %}message{% endblock %} {% block content %} - {% if error %} - - {% endif %} - {% if msg %} - - {% endif %} + +{% if error %}{{macros.alert(error, true)}}{% endif %} +{% if msg %}{{macros.alert(msg, false)}}{% endif %}
{{title}}
{% set form_action = "/admin/badge_grant" if grant else "/admin/badge_remove" %} diff --git a/files/templates/admin/edit_rules.html b/files/templates/admin/edit_rules.html index ba02b31dc..d213059e0 100644 --- a/files/templates/admin/edit_rules.html +++ b/files/templates/admin/edit_rules.html @@ -3,19 +3,7 @@ {% block pagetitle %}Edit {{SITE_NAME}}'s rules{% endblock %} {% block content %} - -{% if msg %} - -{% endif %} - +{% if msg %}{{macros.alert(msg, false)}}{% endif %}
@@ -38,5 +26,4 @@
- {% endblock %} diff --git a/files/templates/casino/game_screen.html b/files/templates/casino/game_screen.html index 9aab40c72..bb858b097 100644 --- a/files/templates/casino/game_screen.html +++ b/files/templates/casino/game_screen.html @@ -362,7 +362,7 @@
{% block screen %} {% endblock %}
diff --git a/files/templates/contact.html b/files/templates/contact.html index e9e80554e..a720ae378 100644 --- a/files/templates/contact.html +++ b/files/templates/contact.html @@ -1,20 +1,8 @@ {% extends "default.html" %} {% block pagetitle %}Contact{% endblock %} {% block content %} - {% if msg %} - - {% endif %} - + {% if msg %}{{macros.alert(msg, false)}}{% endif %}

Contact {{SITE_NAME}} Admins

- {% if v %}

Use this form to contact {{SITE_NAME}} Admins.

diff --git a/files/templates/default.html b/files/templates/default.html index 7be3cdd86..add1c26c2 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -9,8 +9,8 @@ {% else %} {% if err and SITE_NAME == 'rDrama' %} {% set src = "banner_error.webp" | asset_siteimg %} - {% elif sub %} - {% set src = sub.banner_url %} + {% elif sub and sub.has_banners %} + {% set src = sub.random_banner() %} {% set alt = ['/h/', sub, 'banner']|join %} {% set class = 'site-banner-hole' %} {% elif SITE_NAME == "rDrama" %} diff --git a/files/templates/live.html b/files/templates/live.html index dcd2005fc..1739f3719 100644 --- a/files/templates/live.html +++ b/files/templates/live.html @@ -19,28 +19,8 @@ } - {% if error %} - - {% endif %} - {% if msg %} - - {% endif %} + {% if error %}{{macros.alert(error, true)}}{% endif %} + {% if msg %}{{macros.alert(msg, false)}}{% endif %}

Live

diff --git a/files/templates/login/authforms.html b/files/templates/login/authforms.html index 48c4bebae..c438fcfa4 100644 --- a/files/templates/login/authforms.html +++ b/files/templates/login/authforms.html @@ -15,26 +15,9 @@

{% block authtitle %}{% endblock %}

{% block authtext %}{% endblock %}

- {% if error %} - - {% endif %} - {% if msg %} - - {% endif %} - {% block content %}{% endblock %} + {% if error %}{{macros.alert(error, true)}}{% endif %} + {% if msg %}{{macros.alert(msg, false)}}{% endif %} + {% block content %}{% endblock %}
diff --git a/files/templates/login/login.html b/files/templates/login/login.html index eb15d5d1e..dcfb09bdc 100644 --- a/files/templates/login/login.html +++ b/files/templates/login/login.html @@ -11,19 +11,11 @@ {% block authtext %}Glad to have you back!{% endblock %} {% block content %}
- {% if failed %} - - {% endif %} + {%- set error_text -%} + Incorrect username, email address, or password.
+ Forgot password? + {%- endset -%} + {% if failed %}{{macros.alert(error_text, true)}}{% endif %}

Two-step login

To login, please enter the 6-digit verification code generated in your authenticator app.

- {% if failed %} - {% endif %} diff --git a/files/templates/search_comments.html b/files/templates/search_comments.html index fb9ea814d..e5361fe91 100644 --- a/files/templates/search_comments.html +++ b/files/templates/search_comments.html @@ -7,14 +7,8 @@ {% if error %}
-
-
- - - - -
{{error}}
-
+
+ {{macros.ghost_box(error, '', 1)}}
{% endif %} diff --git a/files/templates/settings.html b/files/templates/settings.html index 9edc97a8d..0c6184329 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -7,30 +7,8 @@
- - {% if error %} - - {% endif %} - {% if msg %} - - {% endif %} - + {% if error %}{{macros.alert(error, true)}}{% endif %} + {% if msg %}{{macros.alert(msg, false)}}{% endif %}

Settings

Settings

diff --git a/files/templates/settings/security.html b/files/templates/settings/security.html index c42addd57..e6efe0c3b 100644 --- a/files/templates/settings/security.html +++ b/files/templates/settings/security.html @@ -136,17 +136,7 @@
- {% if error %} - - {% endif %} + {% if error %}{{macros.alert(error, true)}}{% endif %}
@@ -187,10 +177,7 @@
{% else %} -
- -

No blocked users

-
+ {{macros.ghost_box('No blocked users', '', 2)}} {% endif %}
diff --git a/files/templates/sub/settings.html b/files/templates/sub/settings.html index 96c57f912..a62c23986 100644 --- a/files/templates/sub/settings.html +++ b/files/templates/sub/settings.html @@ -1,30 +1,9 @@ {% extends "default.html" %} {% block pagetitle %}/h/{{sub}} Settings{% endblock %} + {% block content %} -{% if error %} - -{% endif %} - -{% if msg %} - -{% endif %} - +{% if error %}{{macros.alert(error, true)}}{% endif %} +{% if msg %}{{macros.alert(msg, false)}}{% endif %}
@@ -37,21 +16,14 @@ Make this hole blocked by default (users can visit it to unblock it).
- -
Marsey
- +
Marsey
-
-
sub marsey picture
-
-
-
@@ -59,34 +31,21 @@ Update -
-
-
All image files are supported. Max file size is {% if v and v.patron %}16{% else %}8{% endif %} MB.
-
-
-
-
Sidebar Picture
-
-
-
sub sidebar picture
-
-
-
@@ -94,70 +53,62 @@ Update
-
-
-
All image files are supported. Max file size is {% if v and v.patron %}16{% else %}8{% endif %} MB.
-
-
-
- - -
Banner
- -
- -
- +
Banners
+
+ {% for banner in sub.banner_urls %} +
- +
-
-
- + +
+
+
+ {% else %} +
+ {{macros.ghost_box("No banners uploaded", "", 2, "flex:1;")}} +
+ {% endfor %} + {% if not g.is_tor %} +
+
+
-
+ +
-
-
-
All image files are supported. Max file size is {% if v and v.patron %}16{% else %}8{% endif %} MB.
-
- -
- + + {% endif %}
- -
-

Edit Sidebar

-
+

Edit Sidebar