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/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..925e77f70 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.const 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 9c48b9d95..a7ce87fbc 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 3f35bf61f..8cc873f78 100644 --- a/files/classes/mod_logs.py +++ b/files/classes/mod_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 diff --git a/files/classes/sub.py b/files/classes/sub.py index 2065bb58d..2cb6db151 100644 --- a/files/classes/sub.py +++ b/files/classes/sub.py @@ -8,7 +8,7 @@ from sqlalchemy.sql.sqltypes import * 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 * diff --git a/files/classes/sub_logs.py b/files/classes/sub_logs.py index b835cb3ee..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 diff --git a/files/classes/submission.py b/files/classes/submission.py index 6fc18642a..071de737d 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 cdf33f36b..81bf1d248 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -12,7 +12,7 @@ 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.media import * from files.helpers.security import * from files.helpers.sorting_and_time import * diff --git a/files/events/__init__.py b/files/events/__init__.py index 71d2ada39..b4735cdd5 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.const import AWARDS2, AWARDS_DISABLED from files.__main__ import engine from files.events.classes import * 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 e831f958b..e9888f882 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/const.py b/files/helpers/config/const.py similarity index 99% rename from files/helpers/const.py rename to files/helpers/config/const.py index 879e7d6e2..193ac0815 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 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 b8b10207f..32c871042 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 3c5877caa..aa938f67f 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 = '' 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 7b99d3e21..e36dc79a1 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 c6dd92956..742f8d273 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 a11c7c6c2..8c60b809a 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_from_directory, send_file diff --git a/files/routes/admin.py b/files/routes/admin.py index 25d1c503b..7becbc01f 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -6,7 +6,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 * 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 f56181c9f..12687893e 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 3defb8176..26355a906 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -7,7 +7,7 @@ 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.get import * from files.helpers.marsify import marsify from files.helpers.owoify import owoify 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 17ee16af2..6ead6fc71 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 fe7a4b7f8..c2cbb4b30 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 8f6ec3274..5ac6f98ed 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 a4077aec6..00b9e0d61 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 fd22453a3..8502eb072 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 655b3c8d4..623399d9a 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -11,7 +11,7 @@ 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 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/users.py b/files/routes/users.py index 27dfa657f..7fe6d019d 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -15,7 +15,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 a6cdebe78..476ca13f9 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