Bubble [main]

Admin: Adjusting batch delete

89eb92f201c22fefcceaad6fd8501b161bb1ca5e
[1mdiff --git a/model.py b/model.py[m
[1mindex f3bdec7..84f6e2d 100644[m
[1m--- a/model.py[m
[1m+++ b/model.py[m
[36m@@ -663,7 +663,7 @@[m [mclass Database:[m
         self.notify_admin(Notification.USER_CREATED, user_id)[m
         return user_id[m
 [m
[31m-    def get_users(self, role, max_age=None, avatar=None, post_count=None):[m
[32m+[m[32m    def get_users(self, role, max_age=None, avatar=None, empty_info=None, max_post_count=None):[m
         cur = self.conn.cursor()[m
         cond = ['role=?'][m
         values = [role][m
[36m@@ -673,9 +673,11 @@[m [mclass Database:[m
         if avatar != None:[m
             cond.append('avatar=?')[m
             values.append(avatar)[m
[31m-        if post_count != None:[m
[31m-            cond.append('(SELECT COUNT(*) FROM posts WHERE user=users.id)=?')[m
[31m-            values.append(post_count)[m
[32m+[m[32m        if empty_info != None:[m
[32m+[m[32m            cond.append('info=""')[m
[32m+[m[32m        if max_post_count != None:[m
[32m+[m[32m            cond.append('(SELECT COUNT(*) FROM posts WHERE user=users.id)<=?')[m
[32m+[m[32m            values.append(max_post_count)[m
         cur.execute(f"""[m
             SELECT id, name, avatar, UNIX_TIMESTAMP(ts_created), UNIX_TIMESTAMP(ts_active)[m
             FROM users[m
[36m@@ -1844,8 +1846,10 @@[m [mclass Database:[m
         cur.execute("UPDATE posts SET flags=0 WHERE user=?", (user.id,))[m
         self.commit()[m
 [m
[31m-    def batch_delete_limited_users(self, max_age):[m
[31m-        for user in self.get_users(role=User.LIMITED, max_age=max_age, avatar='🚀', post_count=0):[m
[32m+[m[32m    def batch_delete_limited_users(self, max_age, max_post_count=1):[m
[32m+[m[32m        for user in self.get_users(role=User.LIMITED, max_age=max_age, avatar='🚀',[m
[32m+[m[32m                                   empty_info=True,[m
[32m+[m[32m                                   max_post_count=max_post_count):[m
             self.destroy_user(user)[m
 [m
     def update_post(self, post, title=None, flags=None, subspace_id=None):[m