From cd573133a9f02d420d6a3fc6fb32855e37091d4b Mon Sep 17 00:00:00 2001 From: Aevann Date: Sat, 28 Jan 2023 10:47:52 +0200 Subject: [PATCH] fix images in modmail --- files/helpers/media.py | 6 ++++-- files/routes/users.py | 4 +++- files/templates/admin/dm_images.html | 12 ++++++++---- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/files/helpers/media.py b/files/helpers/media.py index d2e71070a..ad5d6af72 100644 --- a/files/helpers/media.py +++ b/files/helpers/media.py @@ -267,6 +267,8 @@ def process_dm_images(v, user): if body: with open(f"{LOG_DIRECTORY}/dm_images.log", "a+", encoding="utf-8") as f: - f.write(f'{body.strip()}, {v.username}, {v.id}, {user.username}, {user.id}\n') - + if user: + f.write(f'{body.strip()}, {v.username}, {v.id}, {user.username}, {user.id}\n') + else: + f.write(f'{body.strip()}, {v.username}, {v.id}, Modmail, Modmail\n') return body diff --git a/files/routes/users.py b/files/routes/users.py index 3314ffbd8..17ca58da5 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -557,6 +557,8 @@ def messagereply(v:User): if parent.sentto == MODMAIL_ID: user_id = None elif v.id == user_id: user_id = parent.sentto + user = None + if user_id: user = get_account(user_id, v=v, include_blocks=True) if hasattr(user, 'is_blocking') and user.is_blocking: @@ -565,7 +567,7 @@ def messagereply(v:User): and hasattr(user, 'is_blocked') and user.is_blocked): abort(403, f"You're blocked by @{user.username}") - body += process_dm_images(v, user) + body += process_dm_images(v, user) body = body.strip() diff --git a/files/templates/admin/dm_images.html b/files/templates/admin/dm_images.html index 5f0dd767e..2da1518a7 100644 --- a/files/templates/admin/dm_images.html +++ b/files/templates/admin/dm_images.html @@ -31,10 +31,14 @@ {% if item[1] != "Unknown" %} - - - @{{item[3]}} - + {% if item[3] == "Modmail" %} + Modmail + {% else %} + + + @{{item[3]}} + + {% endif %} {% endif %}