{NOTIF_MODACTION_PREFIX}%'), - Comment.parent_submission == None, Comment.author_id == AUTOJANNY_ID).count() + return g.db.query(ModAction).filter( + ModAction.created_utc > self.last_viewed_log_notifs, + ModAction.user_id != self.id, + ).count() @property @lazy diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index dd32c49f5..38871262f 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -109,26 +109,6 @@ def NOTIFY_USERS(text, v): return notify_users - bots -def notify_mod_action(by_id, msg): - body_html = sanitize(NOTIF_MODACTION_PREFIX + msg) - new_comment = Comment( - author_id=AUTOJANNY_ID, - parent_submission=None, - level=1, - body_html=body_html, - distinguish_level=6, - is_bot=True) - g.db.add(new_comment) - g.db.flush() - new_comment.top_comment_id = new_comment.id - - send_to = g.db.query(User).filter( - User.admin_level >= NOTIF_MODACTION_JL_MIN, User.id != by_id).all() - for admin in send_to: - notif = Notification(comment_id=new_comment.id, user_id=admin.id) - g.db.add(notif) - - if PUSHER_ID != 'blahblahblah': beams_client = PushNotifications(instance_id=PUSHER_ID, secret_key=PUSHER_KEY) diff --git a/files/helpers/const.py b/files/helpers/const.py index be072d258..1e639ca8f 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -852,7 +852,6 @@ EIGHTBALL_REPLIES = ('The 8-Ball Says: It is certain.": return {"message": "Under attack mode disabled!"} return {"error": "Failed to disable under attack mode."} else: @@ -922,7 +920,6 @@ def shadowban(user_id, v): g.db.add(ma) cache.delete_memoized(frontlist) - notify_mod_action(v.id, f"@{v.username} has shadowbanned @{user.username}") return {"message": "User shadowbanned!"} @@ -947,7 +944,6 @@ def unshadowban(user_id, v): g.db.add(ma) cache.delete_memoized(frontlist) - notify_mod_action(v.id, f"@{v.username} has unshadowbanned @{user.username}") return {"message": "User unshadowbanned!"} @@ -1049,8 +1045,6 @@ def ban_user(user_id, v): comment.bannedfor = f'{duration} by @{v.username}' g.db.add(comment) - notify_mod_action(v.id, f"@{v.username} has banned @{user.username} ({note})") - if 'redir' in request.values: return redirect(user.url) else: return {"message": f"@{user.username} was banned!"} @@ -1086,8 +1080,6 @@ def unban_user(user_id, v): ) g.db.add(ma) - notify_mod_action(v.id, f"@{v.username} has unbanned @{user.username}") - if "@" in request.referrer: return redirect(user.url) else: return {"message": f"@{user.username} was unbanned!"} @@ -1123,9 +1115,6 @@ def ban_post(post_id, v): v.coins += 1 g.db.add(v) - if v.id != post.author_id: - notify_mod_action(v.id, f"@{v.username} has removed [{post.title}]({post.shortlink}) by @{post.author.username}") - requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, json={'files': [f"{SITE_FULL}/logged_out/"]}, timeout=5) @@ -1164,10 +1153,6 @@ def unban_post(post_id, v): v.coins -= 1 g.db.add(v) - if v.id != post.author_id: - notify_mod_action(v.id, f"@{v.username} has approved [{post.title}]({post.shortlink}) by @{post.author.username}") - - return {"message": "Post approved!"} @@ -1327,9 +1312,6 @@ def api_ban_comment(c_id, v): ) g.db.add(ma) - if v.id != comment.author_id: - notify_mod_action(v.id, f"@{v.username} has removed [comment]({comment.shortlink}) by @{comment.author.username}") - return {"message": "Comment removed!"} @@ -1358,10 +1340,6 @@ def api_unban_comment(c_id, v): g.db.add(comment) - if v.id != comment.author_id: - notify_mod_action(v.id, f"@{v.username} has approved [comment]({comment.shortlink}) by @{comment.author.username}") - - return {"message": "Comment approved!"} @@ -1479,9 +1457,6 @@ def admin_nuke_user(v): ) g.db.add(ma) - notify_mod_action(v.id, f"@{v.username} has has removed all content of @{user.username}") - - return redirect(user.url) @@ -1517,7 +1492,4 @@ def admin_nunuke_user(v): ) g.db.add(ma) - notify_mod_action(v.id, f"@{v.username} has approved all of content of @{user.username}") - - return redirect(user.url) diff --git a/files/routes/awards.py b/files/routes/awards.py index 1dcf2e836..0047c8715 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -176,9 +176,17 @@ def award_thing(v, thing_type, id): send_repeatable_notification(author.id, f"Your account has been banned for **yet another day** for {link}. Seriously man?") if v.admin_level > 2: - text = f"@{v.username} has banned @{author.username} for 1 day for {link}." - if note: text += f" ({note})" - notify_mod_action(v.id, text) + log_link = f'/{thing_type}/{thing.id}' + reason = f'{log_link}' + + note = f'reason: "{reason}", duration: for 1 day' + ma=ModAction( + kind="ban_user", + user_id=v.id, + target_user_id=author.id, + _note=note + ) + g.db.add(ma) elif kind == "unban": if not author.is_suspended or not author.unban_utc or time.time() > author.unban_utc: abort(403) @@ -193,9 +201,12 @@ def award_thing(v, thing_type, id): send_repeatable_notification(author.id, "You have been unbanned!") if v.admin_level > 2: - text = f"@{v.username} has unbanned @{author.username} for {link}." - if note: text += f" ({note})" - notify_mod_action(v.id, text) + ma=ModAction( + kind="unban_user", + user_id=v.id, + target_user_id=author.id, + ) + g.db.add(ma) elif kind == "grass": author.is_banned = AUTOJANNY_ID author.ban_reason = f"grass award used by @{v.username} on /{thing_type}/{thing.id}" @@ -203,9 +214,17 @@ def award_thing(v, thing_type, id): send_repeatable_notification(author.id, f"Your account has been banned permanently for {link}. You must [provide the admins](/contact) a timestamped picture of you touching grass/snow/sand/ass to get unbanned!") if v.admin_level > 2: - text = f"@{v.username} has grassed @{author.username} for {link}." - if note: text += f" ({note})" - notify_mod_action(v.id, text) + log_link = f'/{thing_type}/{thing.id}' + reason = f'{log_link}' + + note = f'reason: "{reason}", duration: for 30 days' + ma=ModAction( + kind="ban_user", + user_id=v.id, + target_user_id=author.id, + _note=note + ) + g.db.add(ma) elif kind == "pin": if not FEATURES['PINS']: abort(403) diff --git a/files/routes/notifications.py b/files/routes/notifications.py index cbc1a0180..dbe5d83d8 100644 --- a/files/routes/notifications.py +++ b/files/routes/notifications.py @@ -12,6 +12,7 @@ def clear(v): n.read = True g.db.add(n) v.last_viewed_post_notifs = int(time.time()) + v.last_viewed_log_notifs = int(time.time()) g.db.add(v) return {"message": "Notifications cleared!"} @@ -134,29 +135,16 @@ def notifications_modactions(v): try: page = max(int(request.values.get("page", 1)), 1) except: page = 1 - notifications = g.db.query(Notification, Comment) \ - .join(Notification.comment) \ - .filter(Notification.user_id == v.id, - Comment.body_html.like(f'%
{NOTIF_MODACTION_PREFIX}%'), - Comment.parent_submission == None, Comment.author_id == AUTOJANNY_ID) \ - .order_by(Notification.created_utc.desc()).offset(25 * (page - 1)).limit(101).all() - listing = [] + listing = g.db.query(ModAction).filter(ModAction.user_id != v.id).order_by(ModAction.id.desc()).offset(25*(page-1)).limit(26).all() - for index, x in enumerate(notifications[:100]): - n, c = x - if n.read and index > 24: break - elif not n.read: - n.read = True - c.unread = True - g.db.add(n) - if n.created_utc > 1620391248: c.notif_utc = n.created_utc - listing.append(c) + next_exists = len(listing) > 25 + listing = listing[:25] - next_exists = (len(notifications) > len(listing)) + for ma in listing: + ma.unread = ma.created_utc > v.last_viewed_log_notifs - g.db.commit() - - if request.headers.get("Authorization"): return {"data":[x.json for x in listing]} + v.last_viewed_log_notifs = int(time.time()) + g.db.add(v) return render_template("notifications.html", v=v, @@ -225,7 +213,6 @@ def notifications(v): Comment.is_banned == False, Comment.deleted_utc == 0, Comment.body_html.notlike('%
New site mention%Blocked -
- - --
- - -
- - --
- - -
+-Top 25 by followers
- -
- - -
+-Top 25 by post count
-
- - -
+-Top 25 by comment count
-
- - -
- - --
- - -
- - --
- - -+
- - --
- - -+