From 98fbe6efb1e3b5dd28b6f53fb4672fb1c5de6a40 Mon Sep 17 00:00:00 2001 From: nyaazi Date: Fri, 19 May 2017 20:03:47 +0300 Subject: [PATCH 01/13] Adding report table, route and view. --- nyaa/forms.py | 8 ++++++++ nyaa/models.py | 33 +++++++++++++++++++++++++++++++++ nyaa/routes.py | 27 ++++++++++++++++++++++++++- nyaa/templates/view.html | 28 ++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 1 deletion(-) diff --git a/nyaa/forms.py b/nyaa/forms.py index 09bef8d..8e83fd8 100644 --- a/nyaa/forms.py +++ b/nyaa/forms.py @@ -278,6 +278,14 @@ class TorrentFileData(object): # https://wiki.theory.org/BitTorrentSpecification#Metainfo_File_Structure +class ReportForm(FlaskForm): + reason = TextAreaField('Report reason', [ + Length(min=3, max=255, + message='Report reason must be at least %(min)d characters long ' + 'and %(max)d at most.') + ]) + + def _validate_trackers(torrent_dict, tracker_to_check_for=None): announce = torrent_dict.get('announce') announce_string = _validate_bytes(announce, 'announce', 'utf-8') diff --git a/nyaa/models.py b/nyaa/models.py index 189c635..239da4a 100644 --- a/nyaa/models.py +++ b/nyaa/models.py @@ -380,6 +380,39 @@ class User(db.Model): return self.level is UserLevelType.TRUSTED +class ReportStatus(IntEnum): + IN_REVIEW = 0 + VALID = 1 + INVALID = 2 + + +class Report(db.Model): + __tablename__ = DB_TABLE_PREFIX + 'reports' + + id = db.Column(db.Integer, primary_key=True) + torrent = db.Column(db.Integer, db.ForeignKey( + DB_TABLE_PREFIX + 'torrents.id')) + user_id = db.Column(db.Integer, db.ForeignKey( + 'users.id')) + created_time = db.Column(db.DateTime(timezone=False), default=datetime.utcnow) + reason = db.Column(db.String(length=255), nullable=False) + status = db.Column(ChoiceType(ReportStatus, impl=db.Integer()), nullable=False) + + def __init__(self, torrent, user_id, reason): + self.torrent = torrent + self.user_id = user_id + self.reason = reason + self.status = ReportStatus.IN_REVIEW + + def __repr__(self): + return '' % self.id + + @property + def created_utc_timestamp(self): + ''' Returns a UTC POSIX timestamp, as seconds ''' + return (self.created_time - UTC_EPOCH).total_seconds() + + # class Session(db.Model): # __tablename__ = 'sessions' # diff --git a/nyaa/routes.py b/nyaa/routes.py index fe4ccff..e1a2c14 100644 --- a/nyaa/routes.py +++ b/nyaa/routes.py @@ -578,9 +578,11 @@ def view_torrent(torrent_id): if torrent.filelist: files = json.loads(torrent.filelist.filelist_blob.decode('utf-8')) + report_form = forms.ReportForm() return flask.render_template('view.html', torrent=torrent, files=files, - can_edit=can_edit) + can_edit=can_edit, + form=report_form) @app.route('/view//edit', methods=['GET', 'POST']) @@ -663,6 +665,29 @@ def download_torrent(torrent_id): return resp +@app.route('/view//submit_report', methods=['POST']) +def submit_report(torrent_id): + form = forms.ReportForm(flask.request.form) + + if flask.request.method == 'POST' and form.validate(): + report_reason = (form.reason.data or '').strip() + + if flask.g.user is not None: + current_user_id = flask.g.user.id + report = models.Report( + torrent=torrent_id, + user_id=current_user_id, + reason=report_reason) + + db.session.add(report) + db.session.commit() + flask.flash('Successfully reported torrent!', 'success') + else: + flask.abort(403) + + return flask.redirect(flask.url_for('view_torrent', torrent_id=torrent_id)) + + def _get_cached_torrent_file(torrent): # Note: obviously temporary cached_torrent = os.path.join(app.config['BASE_DIR'], diff --git a/nyaa/templates/view.html b/nyaa/templates/view.html index 6c835b8..cf4b93a 100644 --- a/nyaa/templates/view.html +++ b/nyaa/templates/view.html @@ -1,6 +1,7 @@ {% extends "layout.html" %} {% block title %}{{ torrent.display_name }} :: {{ config.SITE_NAME }}{% endblock %} {% block body %} +{% from "_formhelpers.html" import render_field %}

@@ -54,6 +55,8 @@

{% if torrent.has_torrent %}Download Torrent or {% endif %}Magnet + +
@@ -119,6 +122,31 @@ {% endif %} + + + {% endblock %} From 73c84ce5ec89235ba1507b20abadb8b989f3a5d1 Mon Sep 17 00:00:00 2001 From: nyaazi Date: Sat, 20 May 2017 13:58:58 +0300 Subject: [PATCH 05/13] Remove duplicate reports for already reviewed torrent --- nyaa/models.py | 4 ++++ nyaa/routes.py | 1 + nyaa/templates/view.html | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nyaa/models.py b/nyaa/models.py index e098ffa..1ff6925 100644 --- a/nyaa/models.py +++ b/nyaa/models.py @@ -429,6 +429,10 @@ class Report(db.Model): # reports = cls.query.filter_by(status=0).paginate(page=page, per_page=20) return reports + @classmethod + def remove_reviewed(cls, id): + return cls.query.filter(cls.torrent_id == id, cls.status == 0).delete() + # class Session(db.Model): # __tablename__ = 'sessions' # diff --git a/nyaa/routes.py b/nyaa/routes.py index 401b639..d12c002 100644 --- a/nyaa/routes.py +++ b/nyaa/routes.py @@ -710,6 +710,7 @@ def view_reports(): else: report.status = 2 + models.Report.remove_reviewed(data['torrent']) db.session.commit() flask.flash('Closed report #{}'.format(report.id), 'success') return flask.redirect(flask.url_for('view_reports')) diff --git a/nyaa/templates/view.html b/nyaa/templates/view.html index ca778a4..1c8311e 100644 --- a/nyaa/templates/view.html +++ b/nyaa/templates/view.html @@ -62,7 +62,7 @@ soon{% endif %} -
+
{% if torrent.has_torrent %} Download Torrent or {% endif %} Date: Sat, 20 May 2017 14:23:29 +0300 Subject: [PATCH 06/13] Usage of WTForms for report action --- nyaa/forms.py | 8 +++++++- nyaa/routes.py | 21 +++++++++++++-------- nyaa/templates/reports.html | 11 ++++------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/nyaa/forms.py b/nyaa/forms.py index 32e772b..603f4c3 100644 --- a/nyaa/forms.py +++ b/nyaa/forms.py @@ -6,7 +6,7 @@ import os import re from flask_wtf import FlaskForm from flask_wtf.file import FileField, FileRequired -from wtforms import StringField, PasswordField, BooleanField, TextAreaField, SelectField +from wtforms import StringField, PasswordField, BooleanField, TextAreaField, SelectField, HiddenField from wtforms.validators import DataRequired, Optional, Email, Length, EqualTo, ValidationError from wtforms.validators import Regexp @@ -287,6 +287,12 @@ class ReportForm(FlaskForm): ]) +class ReportActionForm(FlaskForm): + action = SelectField(choices=[('close', 'Close'), ('hide', 'Hide'), ('delete', 'Delete')]) + torrent = HiddenField() + report = HiddenField() + + def _validate_trackers(torrent_dict, tracker_to_check_for=None): announce = torrent_dict.get('announce') announce_string = _validate_bytes(announce, 'announce', 'utf-8') diff --git a/nyaa/routes.py b/nyaa/routes.py index d12c002..6e37cb5 100644 --- a/nyaa/routes.py +++ b/nyaa/routes.py @@ -693,30 +693,35 @@ def view_reports(): page = flask.request.args.get('p', flask.request.args.get('offset', 1, int), int) reports = models.Report.not_reviewed(page) + report_action = forms.ReportActionForm(flask.request.form) - if flask.request.method == 'POST': - data = flask.request.form - torrent = models.Torrent.by_id(data['torrent']) - report = models.Report.by_id(data['report']) + if flask.request.method == 'POST' and report_action.validate(): + action = report_action.action.data + torrent_id = report_action.torrent.data + report_id = report_action.report.data + torrent = models.Torrent.by_id(torrent_id) + report = models.Report.by_id(report_id) + if not torrent or not report or report.status != 0: flask.abort(404) else: - if data['action'] == 'delete': + if action == 'delete': torrent.deleted = True report.status = 1 - elif data['action'] == 'hide': + elif action == 'hide': torrent.hidden = True report.status = 1 else: report.status = 2 - models.Report.remove_reviewed(data['torrent']) + models.Report.remove_reviewed(torrent_id) db.session.commit() flask.flash('Closed report #{}'.format(report.id), 'success') return flask.redirect(flask.url_for('view_reports')) return flask.render_template('reports.html', - reports=reports) + reports=reports, + report_action=report_action) def _get_cached_torrent_file(torrent): diff --git a/nyaa/templates/reports.html b/nyaa/templates/reports.html index 6b85840..455a6e9 100644 --- a/nyaa/templates/reports.html +++ b/nyaa/templates/reports.html @@ -28,13 +28,10 @@ {{ report.created_time }}
- - - + {{ report_action.csrf_token }} + {{ report_action.action }} + {{ report_action.torrent(value=report.torrent.id) }} + {{ report_action.report(value=report.id) }}
From 04c9ef66857fcadffe66bd183799bcebe889385a Mon Sep 17 00:00:00 2001 From: nyaazi Date: Sat, 20 May 2017 15:02:26 +0300 Subject: [PATCH 07/13] Redundant query --- nyaa/models.py | 6 +----- nyaa/routes.py | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nyaa/models.py b/nyaa/models.py index 1ff6925..d106763 100644 --- a/nyaa/models.py +++ b/nyaa/models.py @@ -422,11 +422,7 @@ class Report(db.Model): @classmethod def not_reviewed(cls, page): - reports = cls.query.filter(cls.status == 0)\ - .join(Torrent, aliased=True).filter(Torrent.flags != 36, Torrent.flags != 2)\ - .order_by(db.asc(cls.id))\ - .paginate(page=page, per_page=20) - # reports = cls.query.filter_by(status=0).paginate(page=page, per_page=20) + reports = cls.query.filter_by(status=0).paginate(page=page, per_page=20) return reports @classmethod diff --git a/nyaa/routes.py b/nyaa/routes.py index 6e37cb5..6fd06e4 100644 --- a/nyaa/routes.py +++ b/nyaa/routes.py @@ -701,7 +701,7 @@ def view_reports(): report_id = report_action.report.data torrent = models.Torrent.by_id(torrent_id) report = models.Report.by_id(report_id) - + if not torrent or not report or report.status != 0: flask.abort(404) else: From 1705bfd6ead0194cca1d74b20638971416b61c19 Mon Sep 17 00:00:00 2001 From: nyaazi Date: Sat, 20 May 2017 21:53:23 +0300 Subject: [PATCH 08/13] Using the url_for function --- nyaa/templates/layout.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nyaa/templates/layout.html b/nyaa/templates/layout.html index dcefdf8..0b50d53 100644 --- a/nyaa/templates/layout.html +++ b/nyaa/templates/layout.html @@ -72,12 +72,12 @@
  • RSS
    • {% if config.SITE_FLAVOR == 'nyaa' %}
  • Fap
    • - {% if g.user.is_admin %} -
  • Reports
    • - {% endif %} {% elif config.SITE_FLAVOR == 'sukebei' %}
  • Fun
    • {% endif %} + {% if g.user.is_admin %} +
  • Reports
    • + {% endif %}
      From e13235fc978b93db0ea6e3186046107f7e4ce7b7 Mon Sep 17 00:00:00 2001 From: nyaazi Date: Sat, 20 May 2017 23:00:42 +0300 Subject: [PATCH 09/13] "Unfix" the page --- nyaa/templates/view.html | 310 ++++++++++++++++++--------------------- 1 file changed, 145 insertions(+), 165 deletions(-) diff --git a/nyaa/templates/view.html b/nyaa/templates/view.html index 1c8311e..21d40d7 100644 --- a/nyaa/templates/view.html +++ b/nyaa/templates/view.html @@ -2,179 +2,159 @@ {% block title %}{{ torrent.display_name }} :: {{ config.SITE_NAME }}{% endblock %} {% block body %} {% from "_formhelpers.html" import render_field %} -
      -
      -

      - {% if can_edit %} - - {% endif %} - {{ torrent.display_name }} -

      -
      -
      -
      -
      Category:
      -
      - {{ torrent.main_category.name }} - - {{ torrent.sub_category.name }} -
      - -
      Date:
      -
      {{ torrent.created_time.strftime('%Y-%m-%d %H:%M UTC') }}
      -
      - -
      -
      Submitter:
      -
      {% if not torrent.anonymous and torrent.user %} - {{ torrent.user.username }}{% else %} - Anonymous{% endif %}
      - -
      Seeders:
      -
      {% if config.ENABLE_SHOW_STATS %} - {{ torrent.stats.seed_count }}{% else %}Coming soon{% endif %}
      - -
      - -
      -
      Information:
      -
      - {% if torrent.information %} - {{ torrent.information_as_link | safe }} - {% else %} - No information. - {% endif %} -
      - -
      Leechers:
      -
      {% if config.ENABLE_SHOW_STATS %} - {{ torrent.stats.leech_count }}{% else %}Coming soon{% endif %}
      -
      - -
      -
      File size:
      -
      {{ torrent.filesize | filesizeformat(True) }}
      - -
      Downloads:
      -
      - {% if config.ENABLE_SHOW_STATS %}{{ torrent.stats.download_count }}{% else %}Coming - soon{% endif %}
      -
      -
      -
      - {% if torrent.has_torrent %} - Download Torrent - or {% endif %}Magnet - -
      -
      -
      - -
      -
      - {% if torrent.description %} - {# Escape newlines into html entities because CF strips blank newlines #} - {{ torrent.description | escape | replace('\r\n', '\n') | replace('\n', ' '|safe) }} - {% else %} - #### No description. +
      +
      +

      + {% if can_edit %} + {% endif %} + {{ torrent.display_name }} +

      +
      +
      +
      +
      Category:
      +
      + {{ torrent.main_category.name }} - {{ torrent.sub_category.name }} +
      + +
      Date:
      +
      {{ torrent.created_time.strftime('%Y-%m-%d %H:%M UTC') }}
      +
      + +
      +
      Submitter:
      +
      {% if not torrent.anonymous and torrent.user %}{{ torrent.user.username }}{% else %}Anonymous{% endif %}
      + +
      Seeders:
      +
      {% if config.ENABLE_SHOW_STATS %}{{ torrent.stats.seed_count }}{% else %}Coming soon{% endif %}
      + +
      + +
      +
      Information:
      +
      + {% if torrent.information %} + {{ torrent.information_as_link | safe }} + {% else %} + No information. + {% endif%} +
      + +
      Leechers:
      +
      {% if config.ENABLE_SHOW_STATS %}{{ torrent.stats.leech_count }}{% else %}Coming soon{% endif %}
      +
      + +
      +
      File size:
      +
      {{ torrent.filesize | filesizeformat(True) }}
      + +
      Downloads:
      +
      {% if config.ENABLE_SHOW_STATS %}{{ torrent.stats.download_count }}{% else %}Coming soon{% endif %}
      +
      + {% if torrent.has_torrent %}Download Torrent or {% endif %}Magnet + + +
      +
      - {% if files and files.__len__() <= config.MAX_FILES_VIEW %} -
      -
      -

      -
      - +
      +
      + {% if torrent.description %} + {# Escape newlines into html entities because CF strips blank newlines #} + {{ torrent.description | escape | replace('\r\n', '\n') | replace('\n', ' '|safe) }} + {% else %} + #### No description. + {% endif%} +
      +
      + +{% if files and files.__len__() <= config.MAX_FILES_VIEW %} +
      +
      +

      +
      + +
      +

      +
      + +
      + + + + + + + {%- for key, value in files.items() recursive %} + + {%- if value is iterable %} + + {{ loop(value.items()) }} + {%- else %} + +  {{ key }} + + {%- endif %} + + {%- endfor %} +
      PathSize
      +   {{ key }}{{ value | filesizeformat(True) }}
      +
      +
      +{% elif files %} +
      +
      +

      +
      Too many files to display.
      +

      +
      +
      +{% else %} +
      +
      +

      +
      File list is not available for this torrent.
      +

      +
      +
      +{% endif %} + +

      +
      - -
      - - - - - - - {%- for key, value in files.items() recursive %} - - {%- if value is iterable %} - - {{ loop(value.items()) }} - {%- else %} - -  {{ key }} - - {%- endif %} - - {%- endfor %} -
      PathSize
      -   {{ key }}{{ value | filesizeformat(True) }}
      -
      -
      - {% elif files %} -
      -
      -

      -
      -
      Too many files to display.
      -
      -

      -
      -
      - {% else %} -
      -
      -

      -
      -
      File list is not available for this torrent.
      -
      -

      -
      -
      - {% endif %} - - - + -{% endblock %} +{% endblock %} \ No newline at end of file From 9e656ff7f6fd2a2dd4c01cc71f1e5109568dcd01 Mon Sep 17 00:00:00 2001 From: nyaazi Date: Fri, 26 May 2017 15:29:49 +0300 Subject: [PATCH 10/13] Line too long --- nyaa/forms.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nyaa/forms.py b/nyaa/forms.py index b523111..d29ae82 100644 --- a/nyaa/forms.py +++ b/nyaa/forms.py @@ -7,7 +7,8 @@ import os import re from flask_wtf import FlaskForm from flask_wtf.file import FileField, FileRequired -from wtforms import StringField, PasswordField, BooleanField, TextAreaField, SelectField, HiddenField +from wtforms import StringField, PasswordField, BooleanField, TextAreaField, SelectField,\ + HiddenField from wtforms.validators import DataRequired, Optional, Email, Length, EqualTo, ValidationError from wtforms.validators import Regexp From 5dc8bdaf74fbfe5d348154a3b1a617a4eeef1e79 Mon Sep 17 00:00:00 2001 From: nyaazi Date: Mon, 29 May 2017 16:24:45 +0300 Subject: [PATCH 11/13] For the green --- nyaa/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyaa/models.py b/nyaa/models.py index 331dc12..22d349f 100644 --- a/nyaa/models.py +++ b/nyaa/models.py @@ -638,7 +638,7 @@ class ReportBase(DeclarativeHelperBase): def remove_reviewed(cls, id): return cls.query.filter(cls.torrent_id == id, cls.status == 0).delete() - + # Actually declare our site-specific classes # Torrent From c2b02e252de1b8d49fe8bf0bdad3629f8343867e Mon Sep 17 00:00:00 2001 From: TheAMM Date: Mon, 29 May 2017 16:55:55 +0300 Subject: [PATCH 12/13] Fix permissions --- db_create.py | 0 db_migrate.py | 0 import_to_es.py | 0 run.py | 0 sync_es.py | 0 5 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 db_create.py mode change 100644 => 100755 db_migrate.py mode change 100644 => 100755 import_to_es.py mode change 100644 => 100755 run.py mode change 100644 => 100755 sync_es.py diff --git a/db_create.py b/db_create.py old mode 100644 new mode 100755 diff --git a/db_migrate.py b/db_migrate.py old mode 100644 new mode 100755 diff --git a/import_to_es.py b/import_to_es.py old mode 100644 new mode 100755 diff --git a/run.py b/run.py old mode 100644 new mode 100755 diff --git a/sync_es.py b/sync_es.py old mode 100644 new mode 100755 From 2e4b0b1f9fd2d11627705ed6bdcbb1eb90311d7c Mon Sep 17 00:00:00 2001 From: TheAMM Date: Mon, 29 May 2017 17:05:17 +0300 Subject: [PATCH 13/13] Add Alembic migration for report tables --- .../versions/7f064e009cab_add_report_table.py | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 migrations/versions/7f064e009cab_add_report_table.py diff --git a/migrations/versions/7f064e009cab_add_report_table.py b/migrations/versions/7f064e009cab_add_report_table.py new file mode 100644 index 0000000..3e3992e --- /dev/null +++ b/migrations/versions/7f064e009cab_add_report_table.py @@ -0,0 +1,56 @@ +"""Add Report table + +Revision ID: 7f064e009cab +Revises: 2bceb2cb4d7c +Create Date: 2017-05-29 16:50:28.720980 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '7f064e009cab' +down_revision = '2bceb2cb4d7c' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('nyaa_reports', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('created_time', sa.DateTime(), nullable=True), + sa.Column('reason', sa.String(length=255), nullable=False), + + # sqlalchemy_utils.types.choice.ChoiceType() + sa.Column('status', sa.Integer(), nullable=False), + + sa.Column('torrent_id', sa.Integer(), nullable=False), + sa.Column('user_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['torrent_id'], ['nyaa_torrents.id'], ondelete='CASCADE'), + sa.ForeignKeyConstraint(['user_id'], ['users.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('sukebei_reports', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('created_time', sa.DateTime(), nullable=True), + sa.Column('reason', sa.String(length=255), nullable=False), + + # sqlalchemy_utils.types.choice.ChoiceType() + sa.Column('status', sa.Integer(), nullable=False), + + sa.Column('torrent_id', sa.Integer(), nullable=False), + sa.Column('user_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['torrent_id'], ['sukebei_torrents.id'], ondelete='CASCADE'), + sa.ForeignKeyConstraint(['user_id'], ['users.id'], ), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('sukebei_reports') + op.drop_table('nyaa_reports') + # ### end Alembic commands ###