diff --git a/app/domain/routes.py b/app/domain/routes.py index b3feb925..eb2b87f6 100644 --- a/app/domain/routes.py +++ b/app/domain/routes.py @@ -3,14 +3,16 @@ from flask_login import login_user, logout_user, current_user, login_required from flask_babel import _ from app import db, constants -from app.models import Post, Domain, Community +from app.models import Post, Domain, Community, DomainBlock from app.domain import bp -from app.utils import get_setting, render_template +from app.utils import get_setting, render_template, permission_required from sqlalchemy import desc @bp.route('/d/', methods=['GET']) def show_domain(domain_id): + page = request.args.get('page', 1, type=int) + if '.' in domain_id: domain = Domain.query.filter_by(name=domain_id, banned=False).first() else: @@ -23,16 +25,81 @@ def show_domain(domain_id): filter(Post.from_bot == False, Post.domain_id == domain.id, Community.banned == False).\ order_by(desc(Post.last_active)).all() else: - posts = Post.query.join(Community).filter(Post.domain_id == domain.id, Community.banned == False).order_by(desc(Post.last_active)).all() - # todo: pagination + posts = Post.query.join(Community).filter(Post.domain_id == domain.id, Community.banned == False).order_by(desc(Post.last_active)) + # pagination + posts = posts.paginate(page=page, per_page=100, error_out=False) + next_url = url_for('main.index', page=posts.next_num) if posts.has_next else None + prev_url = url_for('main.index', page=posts.prev_num) if posts.has_prev and page != 1 else None return render_template('domain/domain.html', domain=domain, title=domain.name, posts=posts, - POST_TYPE_IMAGE=constants.POST_TYPE_IMAGE, POST_TYPE_LINK=constants.POST_TYPE_LINK) + POST_TYPE_IMAGE=constants.POST_TYPE_IMAGE, POST_TYPE_LINK=constants.POST_TYPE_LINK, + next_url=next_url, prev_url=prev_url) else: abort(404) @bp.route('/domains', methods=['GET']) def domains(): - domains = Domain.query.filter_by(banned=False).order_by(Domain.name).all() + page = request.args.get('page', 1, type=int) + search = request.args.get('search', '') - return render_template('domain/domains.html', title='All known domains', domains=domains) \ No newline at end of file + domains = Domain.query.filter_by(banned=False) + if search != '': + domains = domains.filter(Domain.name.ilike(f'%{search}%')) + domains = domains.order_by(Domain.name) + domains = domains.paginate(page=page, per_page=100, error_out=False) + + next_url = url_for('main.index', page=domains.next_num) if domains.has_next else None + prev_url = url_for('main.index', page=domains.prev_num) if domains.has_prev and page != 1 else None + + return render_template('domain/domains.html', title='All known domains', domains=domains, + next_url=next_url, prev_url=prev_url, search=search) + + +@bp.route('/d//block') +@login_required +def domain_block(domain_id): + domain = Domain.query.get_or_404(domain_id) + block = DomainBlock.query.filter_by(user_id=current_user.id, domain_id=domain_id).first() + if not block: + block = DomainBlock(user_id=current_user.id, domain_id=domain_id) + db.session.add(block) + db.session.commit() + flash(_('%(name)s blocked.', name=domain.name)) + return redirect(url_for('domain.show_domain', domain_id=domain.id)) + + +@bp.route('/d//unblock') +@login_required +def domain_unblock(domain_id): + domain = Domain.query.get_or_404(domain_id) + block = DomainBlock.query.filter_by(user_id=current_user.id, domain_id=domain_id).first() + if not block: + db.session.delete(block) + db.session.commit() + flash(_('%(name)s un-blocked.', name=domain.name)) + return redirect(url_for('domain.show_domain', domain_id=domain.id)) + + +@bp.route('/d//ban') +@login_required +@permission_required('manage users') +def domain_ban(domain_id): + domain = Domain.query.get_or_404(domain_id) + if domain: + domain.banned = True + db.session.commit() + domain.purge_content() + flash(_('%(name)s banned for all users and all content deleted.', name=domain.name)) + return redirect(url_for('domain.domains')) + + +@bp.route('/d//unban') +@login_required +@permission_required('manage users') +def domain_unban(domain_id): + domain = Domain.query.get_or_404(domain_id) + if domain: + domain.banned = True + db.session.commit() + flash(_('%(name)s un-banned for all users.', name=domain.name)) + return redirect(url_for('domain.show_domain', domain_id=domain.id)) diff --git a/app/models.py b/app/models.py index a336c25a..903b6dbe 100644 --- a/app/models.py +++ b/app/models.py @@ -796,6 +796,21 @@ class Domain(db.Model): notify_mods = db.Column(db.Boolean, default=False, index=True) notify_admins = db.Column(db.Boolean, default=False, index=True) + def blocked_by(self, user): + block = DomainBlock.query.filter_by(domain_id=self.id, user_id=user.id).first() + return block is not None + + def purge_content(self): + files = File.query.join(Post).filter(Post.domain_id == self.id).all() + for file in files: + file.delete_from_disk() + posts = Post.query.filter_by(domain_id=self.id).all() + for post in posts: + post.delete_dependencies() + post.flush_cache() + db.session.delete(post) + db.session.commit() + class DomainBlock(db.Model): user_id = db.Column(db.Integer, db.ForeignKey('user.id'), primary_key=True) diff --git a/app/templates/domain/domain.html b/app/templates/domain/domain.html index 7951bce7..e362687f 100644 --- a/app/templates/domain/domain.html +++ b/app/templates/domain/domain.html @@ -19,10 +19,64 @@

{{ _('No posts in this domain yet.') }}

{% endfor %} + +
diff --git a/app/templates/domain/domains.html b/app/templates/domain/domains.html index d8e11c00..8edffa4e 100644 --- a/app/templates/domain/domains.html +++ b/app/templates/domain/domains.html @@ -10,16 +10,26 @@
  • Domains
    • + {% if search == '' %}

    {{ _('All known domains') }}

    -
    -
      + {% else %} +

      {{ _('Domains containing %(search)s', search=search) }}

      + {% endif %} +
      + + + + + + + {% for domain in domains %} -
    • - {{ domain.name }} -
      • + + + {% endfor %} - - + +
      {{ _('Domain') }}
      {{ domain.name }}