diff --git a/Dockerfile b/Dockerfile index 5d5ebf6190..f973d88e31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN pip3 install -r /requirements.txt RUN mkdir /images RUN mkdir /chat_images -RUN mkdir /dm_images +RUN mkdir /dm_media RUN mkdir /songs RUN mkdir /temp_songs RUN mkdir /videos diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py index 8827da07ed..516a888ff0 100644 --- a/files/helpers/config/const.py +++ b/files/helpers/config/const.py @@ -495,7 +495,7 @@ PERMS = { # Minimum admin_level to perform action. 'VIEW_PATRONS': 5, 'BLACKJACK_NOTIFICATIONS': 5, 'IGNORE_BADGE_BLACKLIST': 5, - 'ENABLE_DM_IMAGES': 5, + 'ENABLE_DM_MEDIA': 5, 'SEE_GHOST_VOTES': 5, 'SITE_OFFLINE_MODE': 5, 'MODS_EVERY_HOLE': 5, diff --git a/files/helpers/config/modaction_types.py b/files/helpers/config/modaction_types.py index c91d9a4c81..8795732c2e 100644 --- a/files/helpers/config/modaction_types.py +++ b/files/helpers/config/modaction_types.py @@ -96,7 +96,7 @@ MODACTION_TYPES = { "icon": 'fa-shield', "color": 'bg-muted' }, - 'disable_dm_images': { + 'disable_dm_media': { "str": 'disabled DM images', "icon": 'fa-images', "color": 'bg-muted' @@ -166,7 +166,7 @@ MODACTION_TYPES = { "icon": 'fa-shield', "color": 'bg-success', }, - 'enable_dm_images': { + 'enable_dm_media': { "str": 'enabled DM images', "icon": 'fa-images', "color": 'bg-success', diff --git a/files/helpers/media.py b/files/helpers/media.py index e39ac2d0c5..09c3fb8e39 100644 --- a/files/helpers/media.py +++ b/files/helpers/media.py @@ -60,7 +60,7 @@ def process_files(files, v, body, is_dm=False, dm_user=None): body = body.replace(f'[{file.filename}]', f' {url} ', 1) if is_dm: - with open(f"{LOG_DIRECTORY}/dm_images.log", "a+", encoding="utf-8") as f: + with open(f"{LOG_DIRECTORY}/dm_media.log", "a+", encoding="utf-8") as f: if dm_user: f.write(f'{url}, {v.username}, {v.id}, {dm_user.username}, {dm_user.id}, {int(time.time())}\n') else: diff --git a/files/helpers/settings.py b/files/helpers/settings.py index 242b45538c..1f61ffbf12 100644 --- a/files/helpers/settings.py +++ b/files/helpers/settings.py @@ -15,7 +15,7 @@ _SETTINGS = { "offline_mode": False, "signups": True, "under_siege": False, - "dm_images": True, + "dm_media": True, "ddos_detected": False } diff --git a/files/routes/admin.py b/files/routes/admin.py index ebfde3cc64..fa3e37f9ea 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -42,12 +42,12 @@ def loggedout_list(v): users = sorted([val[1] for x,val in cache.get('loggedout').items() if time.time()-val[0] < LOGGEDIN_ACTIVE_TIME]) return render_template("admin/loggedout.html", v=v, users=users) -@app.get('/admin/dm_images') +@app.get('/admin/dm_media') @limiter.limit(DEFAULT_RATELIMIT) @limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID) -@admin_level_required(PERMS['ENABLE_DM_IMAGES']) -def dm_images(v): - with open(f"{LOG_DIRECTORY}/dm_images.log", "r", encoding="utf-8") as f: +@admin_level_required(PERMS['ENABLE_DM_MEDIA']) +def dm_media(v): + with open(f"{LOG_DIRECTORY}/dm_media.log", "r", encoding="utf-8") as f: items=f.read().split("\n")[:-1] total = len(items) @@ -61,7 +61,7 @@ def dm_images(v): secondrange = firstrange + PAGE_SIZE items = items[firstrange:secondrange] - return render_template("admin/dm_images.html", v=v, items=items, total=total, page=page) + return render_template("admin/dm_media.html", v=v, items=items, total=total, page=page) @app.get('/admin/edit_rules') @limiter.limit(DEFAULT_RATELIMIT) diff --git a/files/routes/users.py b/files/routes/users.py index 5c381ef629..6f1006c692 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -541,7 +541,7 @@ def message2(v:User, username:str): body = sanitize_raw_body(request.values.get("message"), False) - if not g.is_tor and get_setting("dm_images"): + if not g.is_tor and get_setting("dm_media"): body = process_files(request.files, v, body, is_dm=True, dm_user=user) body = body.strip()[:COMMENT_BODY_LENGTH_LIMIT] #process_files potentially adds characters to the post @@ -618,7 +618,7 @@ def messagereply(v:User): and hasattr(user, 'is_blocked') and user.is_blocked): abort(403, f"You're blocked by @{user.username}") - if not g.is_tor and get_setting("dm_images"): + if not g.is_tor and get_setting("dm_media"): body = process_files(request.files, v, body, is_dm=True, dm_user=user) body = body.strip()[:COMMENT_BODY_LENGTH_LIMIT] #process_files potentially adds characters to the post diff --git a/files/templates/admin/admin_home.html b/files/templates/admin/admin_home.html index 44d24a4850..58665796da 100644 --- a/files/templates/admin/admin_home.html +++ b/files/templates/admin/admin_home.html @@ -37,8 +37,8 @@

Content