WIP image proxy

.dockerignore

@@ -3,4 +3,3 @@ data*
 uploads
 *.pyc
 __pycache__
-env

.github/FUNDING.yml

@@ -1,4 +0,0 @@
-# These are supported funding model platforms
-
-patreon: rubenwardy
-custom: [ "https://rubenwardy.com/donate/" ]

.github/workflows/test.yml

@@ -1,21 +0,0 @@
-name: Tests
-
-on: [push, pull_request]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Copy config
-      run: cp utils/ci/* .
-    - name: Build the Docker image
-      run: docker-compose build
-    - name: Start Docker
-      run: docker-compose up -d
-    - name: Run migrations
-      run: ./utils/run_migrations.sh
-    - name: Run tests
-      run: ./utils/tests_cov.sh
-    - name: Stop Docker
-      run: docker-compose down

.gitignore

@@ -11,7 +11,6 @@ app/public/thumbnails
 celerybeat-schedule
 /data
 .idea
-*.mo
 
 # Created by https://www.gitignore.io/api/linux,macos,python,windows
 
@@ -106,6 +105,10 @@ coverage.xml
 *.cover
 .hypothesis/
 
+# Translations
+*.mo
+*.pot
+
 # Flask stuff:
 instance/
 .webassets-cache

.gitlab-ci.yml

@@ -0,0 +1,22 @@
+image: docker/compose
+services:
+  - docker:dind
+cache:
+  key: "$CI_COMMIT_REF_SLUG"
+  paths:
+    - /var/lib/docker
+
+# build:
+#   stage: build
+#   script:
+#     - cp utils/gitlabci/* .
+#     - docker-compose build
+
+UI_Test:
+  stage: test
+  script:
+    - cp utils/gitlabci/* .
+    - docker-compose up -d
+    - ./utils/run_migrations.sh
+    - ./utils/tests_cov.sh
+    - docker-compose down

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10.11
+FROM python:3.6
 
 RUN groupadd -g 5123 cdb && \
     useradd -r -u 5123 -g cdb cdb
@@ -16,9 +16,7 @@ COPY utils utils
 COPY config.cfg config.cfg
 COPY migrations migrations
 COPY app app
-COPY translations translations
 
-RUN pybabel compile -d translations
 RUN chown -R cdb:cdb /home/cdb
 
 USER cdb

README.md

@@ -1,16 +1,10 @@
-# ContentDB
-![Build Status](https://github.com/minetest/contentdb/actions/workflows/test.yml/badge.svg)
+# Content Database
+[![Build status](https://gitlab.com/minetest/contentdb/badges/master/pipeline.svg)](https://gitlab.com/minetest/contentdb/pipelines)
 
-A content database for Minetest mods, games, and more.\
+Content database for Minetest mods, games, and more.\
 Developed by rubenwardy, license AGPLv3.0+.
 
-See [Getting Started](docs/getting_started.md) for setting up a development/prodiction environment.
-
-See [Developer Intro](docs/dev_intro.md) for an overview of the code organisation.
-
-## Credits
-
-* `app/public/static/placeholder.png`: erlehmann, Warr1024. License: CC BY-SA 3.0
+See [Getting Started](docs/getting_started.md).
 
 ## How-tos
 
@@ -36,7 +30,7 @@ See [Developer Intro](docs/dev_intro.md) for an overview of the code organisatio
 
 * (optional) Install the [Docker extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker)
 * Install the [Python extension](https://marketplace.visualstudio.com/items?itemName=ms-python.python)
-	* Click no to installing pylint (we don't want it to be installed outside a virtual env)
+	* Click no to installing pylint (we don't want it to be installed outside of a virtual env)
 * Set up a virtual env
 	* Replace `psycopg2` with `psycopg2_binary` in requirements.txt (because postgresql won't be installed on the system)
 	* `python3 -m venv env`

app/__init__.py

@@ -14,70 +14,53 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import datetime
-import os
-import redis
 
-from flask import redirect, url_for, render_template, flash, request, Flask, send_from_directory, make_response
-from flask_babel import Babel, gettext
-from flask_flatpages import FlatPages
-from flask_github import GitHub
+from flask import *
 from flask_gravatar import Gravatar
-from flask_login import logout_user, current_user, LoginManager
+import flask_menu as menu
 from flask_mail import Mail
+from flask_github import GitHub
 from flask_wtf.csrf import CSRFProtect
-
-from app.markdown import init_markdown, MARKDOWN_EXTENSIONS, MARKDOWN_EXTENSION_CONFIG
+from flask_flatpages import FlatPages
+from flask_babel import Babel
+from flask_login import logout_user, current_user, LoginManager
+import os, redis
 
 app = Flask(__name__, static_folder="public/static")
 app.config["FLATPAGES_ROOT"] = "flatpages"
 app.config["FLATPAGES_EXTENSION"] = ".md"
-app.config["FLATPAGES_MARKDOWN_EXTENSIONS"] = MARKDOWN_EXTENSIONS
-app.config["FLATPAGES_EXTENSION_CONFIG"] = MARKDOWN_EXTENSION_CONFIG
-app.config["BABEL_TRANSLATION_DIRECTORIES"] = "../translations"
-app.config["LANGUAGES"] = {
-	"en": "English",
-	"de": "Deutsch",
-	"es": "Español",
-	"fr": "Français",
-	"id": "Bahasa Indonesia",
-	"it": "Italiano",
-	"ms": "Bahasa Melayu",
-	"pl": "Język Polski",
-	"ru": "русский язык",
-	"sk": "Slovenčina",
-	"sv": "Svenska",
-	"tr": "Türkçe",
-	"uk": "Українська",
-	"vi": "tiếng Việt",
-	"zh_Hans": "汉语",
+app.config["FLATPAGES_MARKDOWN_EXTENSIONS"] = ["fenced_code", "tables", "codehilite", 'toc']
+app.config["FLATPAGES_EXTENSION_CONFIG"] = {
+	"fenced_code": {},
+	"tables": {},
+	"codehilite": {
+		"linenums": "True"
+	}
 }
-
 app.config.from_pyfile(os.environ["FLASK_CONFIG"])
 
-redis_client = redis.Redis.from_url(app.config["REDIS_URL"])
+r = redis.Redis.from_url(app.config["REDIS_URL"])
 
+menu.Menu(app=app)
 github = GitHub(app)
 csrf = CSRFProtect(app)
 mail = Mail(app)
 pages = FlatPages(app)
-babel = Babel()
+babel = Babel(app)
 gravatar = Gravatar(app,
-		size=64,
+		size=58,
 		rating="g",
-		default="retro",
+		default="mp",
 		force_default=False,
 		force_lower=False,
 		use_ssl=True,
 		base_url=None)
-init_markdown(app)
 
 login_manager = LoginManager()
 login_manager.init_app(app)
 login_manager.login_view = "users.login"
 
-
-from .sass import init_app as sass
+from .sass import sass
 sass(app)
 
 
@@ -86,8 +69,14 @@ if not app.debug and app.config["MAIL_UTILS_ERROR_SEND_TO"]:
 	app.logger.addHandler(build_handler(app))
 
 
-from . import models, template_filters
+from app.utils.markdown import init_app
+init_app(app)
 
+# @babel.localeselector
+# def get_locale():
+# 	return request.accept_languages.best_match(app.config["LANGUAGES"].keys())
+
+from . import models, template_filters
 
 @login_manager.user_loader
 def load_user(user_id):
@@ -97,105 +86,31 @@ def load_user(user_id):
 from .blueprints import create_blueprints
 create_blueprints(app)
 
-
 @app.route("/uploads/<path:path>")
 def send_upload(path):
 	return send_from_directory(app.config["UPLOAD_DIR"], path)
 
-
+@menu.register_menu(app, ".help", "Help", order=19, endpoint_arguments_constructor=lambda: { "path": "help" })
 @app.route("/<path:path>/")
 def flatpage(path):
 	page = pages.get_or_404(path)
 	template = page.meta.get("template", "flatpage.html")
 	return render_template(template, page=page)
 
-
 @app.before_request
 def check_for_ban():
 	if current_user.is_authenticated:
-		if current_user.ban and current_user.ban.has_expired:
-			models.db.session.delete(current_user.ban)
-			if current_user.rank == models.UserRank.BANNED:
-				current_user.rank = models.UserRank.MEMBER
-			models.db.session.commit()
-		elif current_user.ban or current_user.rank == models.UserRank.BANNED:
-			if current_user.ban:
-				flash(gettext("Banned:") + " " + current_user.ban.message, "danger")
-			else:
-				flash(gettext("You have been banned."), "danger")
+		if current_user.rank == models.UserRank.BANNED:
+			flash("You have been banned.", "danger")
 			logout_user()
 			return redirect(url_for("users.login"))
 		elif current_user.rank == models.UserRank.NOT_JOINED:
-			current_user.rank = models.UserRank.NEW_MEMBER
+			current_user.rank = models.UserRank.MEMBER
 			models.db.session.commit()
 
-
-from .utils import clear_notifications, is_safe_url, create_session
-
+from .utils import clearNotifications
 
 @app.before_request
 def check_for_notifications():
 	if current_user.is_authenticated:
-		clear_notifications(request.path)
-
-
-@app.errorhandler(404)
-def page_not_found(e):
-	return render_template("404.html"), 404
-
-
-@app.errorhandler(500)
-def server_error(e):
-	return render_template("500.html"), 500
-
-
-def get_locale():
-	if not request:
-		return None
-
-	locales = app.config["LANGUAGES"].keys()
-
-	if current_user.is_authenticated and current_user.locale in locales:
-		return current_user.locale
-
-	locale = request.cookies.get("locale")
-	if locale not in locales:
-		locale = request.accept_languages.best_match(locales)
-
-	if locale and current_user.is_authenticated:
-		with create_session() as new_session:
-			new_session.query(models.User) \
-				.filter(models.User.username == current_user.username) \
-				.update({"locale": locale})
-			new_session.commit()
-
-	return locale
-
-
-babel.init_app(app, locale_selector=get_locale)
-
-
-@app.route("/set-locale/", methods=["POST"])
-@csrf.exempt
-def set_locale():
-	locale = request.form.get("locale")
-	if locale not in app.config["LANGUAGES"].keys():
-		flash("Unknown locale {}".format(locale), "danger")
-		locale = None
-
-	next_url = request.form.get("r")
-	if next_url and is_safe_url(next_url):
-		resp = make_response(redirect(next_url))
-	else:
-		resp = make_response(redirect(url_for("homepage.home")))
-
-	if locale:
-		expire_date = datetime.datetime.now()
-		expire_date = expire_date + datetime.timedelta(days=5*365)
-		resp.set_cookie("locale", locale, expires=expire_date)
-
-		if current_user.is_authenticated:
-			current_user.locale = locale
-			models.db.session.commit()
-
-	return resp
+		clearNotifications(request.path)

app/blueprints/__init__.py

@@ -1,22 +1,4 @@
-# ContentDB
-# Copyright (C) 2018-21 rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import importlib
-import os
-
+import os, importlib
 
 def create_blueprints(app):
 	dir = os.path.dirname(os.path.realpath(__file__))

app/blueprints/admin/actions.py

@@ -1,349 +0,0 @@
-# ContentDB
-# Copyright (C) 2018-21 rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import os
-from typing import List
-
-import requests
-from celery import group, uuid
-from flask import redirect, url_for, flash, current_app
-from sqlalchemy import or_, and_
-
-from app.models import PackageRelease, db, Package, PackageState, PackageScreenshot, MetaPackage, User, \
-	NotificationType, PackageUpdateConfig, License, UserRank, PackageType
-from app.tasks.emails import send_pending_digests
-from app.tasks.forumtasks import import_topic_list, check_all_forum_accounts
-from app.tasks.importtasks import import_repo_screenshot, check_zip_release, check_for_updates, update_all_game_support
-from app.utils import add_notification, get_system_user
-
-actions = {}
-
-
-def action(title: str):
-	def func(f):
-		name = f.__name__
-		actions[name] = {
-			"title": title,
-			"func": f,
-		}
-
-		return f
-
-	return func
-
-
-@action("Delete stuck releases")
-def del_stuck_releases():
-	PackageRelease.query.filter(PackageRelease.task_id.isnot(None)).delete()
-	db.session.commit()
-	return redirect(url_for("admin.admin_page"))
-
-
-@action("Import forum topic list")
-def import_topic_list():
-	task = import_topic_list.delay()
-	return redirect(url_for("tasks.check", id=task.id, r=url_for("todo.topics")))
-
-
-@action("Check all forum accounts")
-def check_all_forum_accounts():
-	task = check_all_forum_accounts.delay()
-	return redirect(url_for("tasks.check", id=task.id, r=url_for("admin.admin_page")))
-
-
-@action("Delete unused uploads")
-def clean_uploads():
-	upload_dir = current_app.config['UPLOAD_DIR']
-
-	(_, _, filenames) = next(os.walk(upload_dir))
-	existing_uploads = set(filenames)
-
-	if len(existing_uploads) != 0:
-		def get_filenames_from_column(column):
-			results = db.session.query(column).filter(column.isnot(None), column != "").all()
-			return set([os.path.basename(x[0]) for x in results])
-
-		release_urls = get_filenames_from_column(PackageRelease.url)
-		screenshot_urls = get_filenames_from_column(PackageScreenshot.url)
-		pp_urls = get_filenames_from_column(User.profile_pic)
-
-		db_urls = release_urls.union(screenshot_urls).union(pp_urls)
-		unreachable = existing_uploads.difference(db_urls)
-
-		import sys
-		print("On Disk: ", existing_uploads, file=sys.stderr)
-		print("In DB: ", db_urls, file=sys.stderr)
-		print("Unreachable: ", unreachable, file=sys.stderr)
-
-		for filename in unreachable:
-			os.remove(os.path.join(upload_dir, filename))
-
-		flash("Deleted " + str(len(unreachable)) + " unreachable uploads", "success")
-	else:
-		flash("No downloads to create", "danger")
-
-	return redirect(url_for("admin.admin_page"))
-
-
-@action("Delete unused mod names")
-def del_mod_names():
-	query = MetaPackage.query.filter(~MetaPackage.dependencies.any(), ~MetaPackage.packages.any())
-	count = query.count()
-	query.delete(synchronize_session=False)
-	db.session.commit()
-
-	flash("Deleted " + str(count) + " unused mod names", "success")
-	return redirect(url_for("admin.admin_page"))
-
-
-@action("Run update configs")
-def run_update_config():
-	check_for_updates.delay()
-
-	flash("Started update configs", "success")
-	return redirect(url_for("admin.admin_page"))
-
-
-def _package_list(packages: List[str]):
-	# Who needs translations?
-	if len(packages) >= 3:
-		packages[len(packages) - 1] = "and " + packages[len(packages) - 1]
-		packages_list = ", ".join(packages)
-	else:
-		packages_list = " and ".join(packages)
-	return packages_list
-
-
-@action("Send WIP package notification")
-def remind_wip():
-	users = User.query.filter(User.packages.any(or_(
-			Package.state == PackageState.WIP, Package.state == PackageState.CHANGES_NEEDED)))
-	system_user = get_system_user()
-	for user in users:
-		packages = db.session.query(Package.title).filter(
-				Package.author_id == user.id,
-				or_(Package.state == PackageState.WIP, Package.state == PackageState.CHANGES_NEEDED)) \
-			.all()
-
-		packages = [pkg[0] for pkg in packages]
-		packages_list = _package_list(packages)
-		havent = "haven't" if len(packages) > 1 else "hasn't"
-
-		add_notification(user, system_user, NotificationType.PACKAGE_APPROVAL,
-			f"Did you forget? {packages_list} {havent} been submitted for review yet",
-						 url_for('todo.view_user', username=user.username))
-	db.session.commit()
-
-
-@action("Send outdated package notification")
-def remind_outdated():
-	users = User.query.filter(User.maintained_packages.any(
-			Package.update_config.has(PackageUpdateConfig.outdated_at.isnot(None))))
-	system_user = get_system_user()
-	for user in users:
-		packages = db.session.query(Package.title).filter(
-				Package.maintainers.contains(user),
-				Package.update_config.has(PackageUpdateConfig.outdated_at.isnot(None))) \
-			.all()
-
-		packages = [pkg[0] for pkg in packages]
-		packages_list = _package_list(packages)
-
-		add_notification(user, system_user, NotificationType.PACKAGE_APPROVAL,
-				f"The following packages may be outdated: {packages_list}",
-						 url_for('todo.view_user', username=user.username))
-
-	db.session.commit()
-
-
-@action("Import licenses from SPDX")
-def import_licenses():
-	renames = {
-		"GPLv2": "GPL-2.0-only",
-		"GPLv3": "GPL-3.0-only",
-		"AGPLv2": "AGPL-2.0-only",
-		"AGPLv3": "AGPL-3.0-only",
-		"LGPLv2.1": "LGPL-2.1-only",
-		"LGPLv3": "LGPL-3.0-only",
-		"Apache 2.0": "Apache-2.0",
-		"BSD 2-Clause / FreeBSD": "BSD-2-Clause-FreeBSD",
-		"BSD 3-Clause": "BSD-3-Clause",
-		"CC0": "CC0-1.0",
-		"CC BY 3.0": "CC-BY-3.0",
-		"CC BY 4.0": "CC-BY-4.0",
-		"CC BY-NC-SA 3.0": "CC-BY-NC-SA-3.0",
-		"CC BY-SA 3.0": "CC-BY-SA-3.0",
-		"CC BY-SA 4.0": "CC-BY-SA-4.0",
-		"NPOSLv3": "NPOSL-3.0",
-		"MPL 2.0": "MPL-2.0",
-		"EUPLv1.2": "EUPL-1.2",
-		"SIL Open Font License v1.1": "OFL-1.1",
-	}
-
-	for old_name, new_name in renames.items():
-		License.query.filter_by(name=old_name).update({ "name": new_name })
-
-	r = requests.get(
-			"https://raw.githubusercontent.com/spdx/license-list-data/master/json/licenses.json")
-	licenses = r.json()["licenses"]
-
-	existing_licenses = {}
-	for license_data in License.query.all():
-		assert license_data.name not in renames.keys()
-		existing_licenses[license_data.name.lower()] = license_data
-
-	for license_data in licenses:
-		obj = existing_licenses.get(license_data["licenseId"].lower())
-		if obj:
-			obj.url = license_data["reference"]
-		elif license_data.get("isOsiApproved") and license_data.get("isFsfLibre") and not license_data["isDeprecatedLicenseId"]:
-			obj = License(license_data["licenseId"], True, license_data["reference"])
-			db.session.add(obj)
-
-	db.session.commit()
-
-
-@action("Delete inactive users")
-def delete_inactive_users():
-	users = User.query.filter(User.is_active == False, ~User.packages.any(), ~User.forum_topics.any(),
-			User.rank == UserRank.NOT_JOINED).all()
-	for user in users:
-		db.session.delete(user)
-	db.session.commit()
-
-
-@action("Send Video URL notification")
-def remind_video_url():
-	users = User.query.filter(User.maintained_packages.any(
-			and_(Package.video_url == None, Package.type == PackageType.GAME, Package.state == PackageState.APPROVED)))
-	system_user = get_system_user()
-	for user in users:
-		packages = db.session.query(Package.title).filter(
-				or_(Package.author == user, Package.maintainers.contains(user)),
-				Package.video_url == None,
-				Package.type == PackageType.GAME,
-				Package.state == PackageState.APPROVED) \
-			.all()
-
-		packages = [pkg[0] for pkg in packages]
-		packages_list = _package_list(packages)
-
-		add_notification(user, system_user, NotificationType.PACKAGE_APPROVAL,
-				f"You should add a video to {packages_list}",
-						 url_for('users.profile', username=user.username))
-
-	db.session.commit()
-
-
-@action("Send missing game support notifications")
-def remind_missing_game_support():
-	users = User.query.filter(
-		User.maintained_packages.any(and_(
-			Package.state != PackageState.DELETED,
-			Package.type.in_([PackageType.MOD, PackageType.TXP]),
-			~Package.supported_games.any(),
-			Package.supports_all_games == False))).all()
-
-	system_user = get_system_user()
-	for user in users:
-		packages = db.session.query(Package.title).filter(
-			Package.maintainers.contains(user),
-			Package.state != PackageState.DELETED,
-			Package.type.in_([PackageType.MOD, PackageType.TXP]),
-			~Package.supported_games.any(),
-			Package.supports_all_games == False) \
-			.all()
-
-		packages = [pkg[0] for pkg in packages]
-		packages_list = _package_list(packages)
-
-		add_notification(user, system_user, NotificationType.PACKAGE_APPROVAL,
-				f"You need to confirm whether the following packages support all games: {packages_list}",
-				url_for('todo.all_game_support', username=user.username))
-
-	db.session.commit()
-
-
-@action("Detect game support")
-def detect_game_support():
-	task_id = uuid()
-	update_all_game_support.apply_async((), task_id=task_id)
-	return redirect(url_for("tasks.check", id=task_id, r=url_for("admin.admin_page")))
-
-
-@action("Send pending notif digests")
-def do_send_pending_digests():
-	send_pending_digests.delay()
-
-
-@action("DANGER: Delete removed packages")
-def del_removed_packages():
-	query = Package.query.filter_by(state=PackageState.DELETED)
-	count = query.count()
-	for pkg in query.all():
-		pkg.review_thread = None
-		db.session.delete(pkg)
-	db.session.commit()
-
-	flash("Deleted {} soft deleted packages packages".format(count), "success")
-	return redirect(url_for("admin.admin_page"))
-
-
-@action("DANGER: Check all releases (postReleaseCheckUpdate)")
-def check_releases():
-	releases = PackageRelease.query.filter(PackageRelease.url.like("/uploads/%")).all()
-
-	tasks = []
-	for release in releases:
-		tasks.append(check_zip_release.s(release.id, release.file_path))
-
-	result = group(tasks).apply_async()
-
-	while not result.ready():
-		import time
-		time.sleep(0.1)
-
-	return redirect(url_for("todo.view_editor"))
-
-
-@action("DANGER: Check latest release of all packages (postReleaseCheckUpdate)")
-def reimport_packages():
-	tasks = []
-	for package in Package.query.filter(Package.state != PackageState.DELETED).all():
-		release = package.releases.first()
-		if release:
-			tasks.append(check_zip_release.s(release.id, release.file_path))
-
-	result = group(tasks).apply_async()
-
-	while not result.ready():
-		import time
-		time.sleep(0.1)
-
-	return redirect(url_for("todo.view_editor"))
-
-
-@action("DANGER: Import screenshots from Git")
-def import_screenshots():
-	packages = Package.query \
-		.filter(Package.state != PackageState.DELETED) \
-		.outerjoin(PackageScreenshot, Package.id == PackageScreenshot.package_id) \
-		.filter(PackageScreenshot.id == None) \
-		.all()
-	for package in packages:
-		import_repo_screenshot.delay(package.id)
-
-	return redirect(url_for("admin.admin_page"))

app/blueprints/admin/admin.py

@@ -14,15 +14,21 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from flask import redirect, render_template, url_for, request, flash
+
+import os
+
+from celery import group
+from flask import *
 from flask_login import current_user, login_user
 from flask_wtf import FlaskForm
-from wtforms import StringField, SubmitField, BooleanField
-from wtforms.validators import InputRequired, Length, Optional
-from app.utils import rank_required, add_audit_log, add_notification, get_system_user, nonempty_or_none
+from wtforms import *
+from wtforms.validators import InputRequired, Length
+
+from app.models import *
+from app.tasks.forumtasks import importTopicList, checkAllForumAccounts
+from app.tasks.importtasks import importRepoScreenshot, checkZipRelease, check_for_updates
+from app.utils import rank_required, addAuditLog, addNotification
 from . import bp
-from .actions import actions
-from app.models import UserRank, Package, db, PackageState, User, AuditSeverity, NotificationType, PackageAlias
 
 
 @bp.route("/admin/", methods=["GET", "POST"])
@@ -30,17 +36,159 @@ from app.models import UserRank, Package, db, PackageState, User, AuditSeverity,
 def admin_page():
 	if request.method == "POST":
 		action = request.form["action"]
-		if action in actions:
-			ret = actions[action]["func"]()
-			if ret:
-				return ret
+
+		if action == "delstuckreleases":
+			PackageRelease.query.filter(PackageRelease.task_id != None).delete()
+			db.session.commit()
+			return redirect(url_for("admin.admin_page"))
+
+		elif action == "checkreleases":
+			releases = PackageRelease.query.filter(PackageRelease.url.like("/uploads/%")).all()
+
+			tasks = []
+			for release in releases:
+				zippath = release.url.replace("/uploads/", app.config["UPLOAD_DIR"])
+				tasks.append(checkZipRelease.s(release.id, zippath))
+
+			result = group(tasks).apply_async()
+
+			while not result.ready():
+				import time
+				time.sleep(0.1)
+
+			return redirect(url_for("todo.view_editor"))
+
+		elif action == "reimportpackages":
+			tasks = []
+			for package in Package.query.filter(Package.state!=PackageState.DELETED).all():
+				release = package.releases.first()
+				if release:
+					zippath = release.url.replace("/uploads/", app.config["UPLOAD_DIR"])
+					tasks.append(checkZipRelease.s(release.id, zippath))
+
+			result = group(tasks).apply_async()
+
+			while not result.ready():
+				import time
+				time.sleep(0.1)
+
+			return redirect(url_for("todo.view_editor"))
+
+		elif action == "importmodlist":
+			task = importTopicList.delay()
+			return redirect(url_for("tasks.check", id=task.id, r=url_for("todo.topics")))
+
+		elif action == "checkusers":
+			task = checkAllForumAccounts.delay()
+			return redirect(url_for("tasks.check", id=task.id, r=url_for("admin.admin_page")))
+
+		elif action == "importscreenshots":
+			packages = Package.query \
+				.filter(Package.state!=PackageState.DELETED) \
+				.outerjoin(PackageScreenshot, Package.id==PackageScreenshot.package_id) \
+				.filter(PackageScreenshot.id==None) \
+				.all()
+			for package in packages:
+				importRepoScreenshot.delay(package.id)
+
+			return redirect(url_for("admin.admin_page"))
+
+		elif action == "restore":
+			package = Package.query.get(request.form["package"])
+			if package is None:
+				flash("Unknown package", "danger")
+			else:
+				package.state = PackageState.READY_FOR_REVIEW
+				db.session.commit()
+				return redirect(url_for("admin.admin_page"))
+
+		elif action == "recalcscores":
+			for p in Package.query.all():
+				p.recalcScore()
+
+			db.session.commit()
+			return redirect(url_for("admin.admin_page"))
+
+		elif action == "cleanuploads":
+			upload_dir = app.config['UPLOAD_DIR']
+
+			(_, _, filenames) = next(os.walk(upload_dir))
+			existing_uploads = set(filenames)
+
+			if len(existing_uploads) != 0:
+				def getURLsFromDB(column):
+					results = db.session.query(column).filter(column != None, column != "").all()
+					return set([os.path.basename(x[0]) for x in results])
+
+				release_urls = getURLsFromDB(PackageRelease.url)
+				screenshot_urls = getURLsFromDB(PackageScreenshot.url)
+
+				db_urls = release_urls.union(screenshot_urls)
+				unreachable = existing_uploads.difference(db_urls)
+
+				import sys
+				print("On Disk: ", existing_uploads, file=sys.stderr)
+				print("In DB: ", db_urls, file=sys.stderr)
+				print("Unreachable: ", unreachable, file=sys.stderr)
+
+				for filename in unreachable:
+					os.remove(os.path.join(upload_dir, filename))
+
+				flash("Deleted " + str(len(unreachable)) + " unreachable uploads", "success")
+			else:
+				flash("No downloads to create", "danger")
+
+			return redirect(url_for("admin.admin_page"))
+
+		elif action == "delmetapackages":
+			query = MetaPackage.query.filter(~MetaPackage.dependencies.any(), ~MetaPackage.packages.any())
+			count = query.count()
+			query.delete(synchronize_session=False)
+			db.session.commit()
+
+			flash("Deleted " + str(count) + " unused meta packages", "success")
+			return redirect(url_for("admin.admin_page"))
+
+		elif action == "delremovedpackages":
+			query = Package.query.filter_by(state=PackageState.DELETED)
+			count = query.count()
+			for pkg in query.all():
+				pkg.review_thread = None
+				db.session.delete(pkg)
+			db.session.commit()
+
+			flash("Deleted {} soft deleted packages packages".format(count), "success")
+			return redirect(url_for("admin.admin_page"))
+
+		elif action == "addupdateconfig":
+			added = 0
+			for pkg in Package.query.filter(Package.repo != None, Package.releases.any(), Package.update_config == None).all():
+				pkg.update_config = PackageUpdateConfig()
+				pkg.update_config.auto_created = True
+
+				release: PackageRelease = pkg.releases.first()
+				if release and release.commit_hash:
+					pkg.update_config.last_commit = release.commit_hash
+
+				db.session.add(pkg.update_config)
+				added += 1
+
+			db.session.commit()
+
+			flash("Added {} update configs".format(added), "success")
+			return redirect(url_for("admin.admin_page"))
+
+		elif action == "runupdateconfig":
+			check_for_updates.delay()
+
+			flash("Started update configs", "success")
+			return redirect(url_for("admin.admin_page"))
 
 		else:
 			flash("Unknown action: " + action, "danger")
 
-	deleted_packages = Package.query.filter(Package.state == PackageState.DELETED).all()
-	return render_template("admin/list.html", deleted_packages=deleted_packages, actions=actions)
-
+	deleted_packages = Package.query.filter(Package.state==PackageState.DELETED).all()
+	return render_template("admin/list.html", deleted_packages=deleted_packages)
 
 class SwitchUserForm(FlaskForm):
 	username = StringField("Username")
@@ -60,13 +208,14 @@ def switch_user():
 		else:
 			flash("Unable to login as user", "danger")
 
+
 	# Process GET or invalid POST
 	return render_template("admin/switch_user.html", form=form)
 
 
 class SendNotificationForm(FlaskForm):
-	title = StringField("Title", [InputRequired(), Length(1, 300)])
-	url = StringField("URL", [InputRequired(), Length(1, 100)], default="/")
+	title  = StringField("Title", [InputRequired(), Length(1, 300)])
+	url    = StringField("URL", [InputRequired(), Length(1, 100)], default="/")
 	submit = SubmitField("Send")
 
 
@@ -75,107 +224,13 @@ class SendNotificationForm(FlaskForm):
 def send_bulk_notification():
 	form = SendNotificationForm(request.form)
 	if form.validate_on_submit():
-		add_audit_log(AuditSeverity.MODERATION, current_user,
-				"Sent bulk notification", url_for("admin.admin_page"), None, form.title.data)
+		addAuditLog(AuditSeverity.MODERATION, current_user,
+				"Sent bulk notification", None, None, form.title.data)
 
 		users = User.query.filter(User.rank >= UserRank.NEW_MEMBER).all()
-		add_notification(users, get_system_user(), NotificationType.OTHER, form.title.data, form.url.data, None)
+		addNotification(users, current_user, NotificationType.OTHER, form.title.data, form.url.data, None)
 		db.session.commit()
 
 		return redirect(url_for("admin.admin_page"))
 
 	return render_template("admin/send_bulk_notification.html", form=form)
-
-
-@bp.route("/admin/restore/", methods=["GET", "POST"])
-@rank_required(UserRank.EDITOR)
-def restore():
-	if request.method == "POST":
-		target = request.form["submit"]
-		if "Review" in target:
-			target = PackageState.READY_FOR_REVIEW
-		elif "Changes" in target:
-			target = PackageState.CHANGES_NEEDED
-		else:
-			target = PackageState.WIP
-
-		package = Package.query.get(request.form["package"])
-		if package is None:
-			flash("Unknown package", "danger")
-		else:
-			package.state = target
-
-			add_audit_log(AuditSeverity.EDITOR, current_user, f"Restored package to state {target.value}",
-						  package.get_url("packages.view"), package)
-
-			db.session.commit()
-			return redirect(package.get_url("packages.view"))
-
-	deleted_packages = Package.query \
-		.filter(Package.state == PackageState.DELETED) \
-		.join(Package.author) \
-		.order_by(db.asc(User.username), db.asc(Package.name)) \
-		.all()
-
-	return render_template("admin/restore.html", deleted_packages=deleted_packages)
-
-
-class TransferPackageForm(FlaskForm):
-	old_username = StringField("Old Username", [InputRequired()])
-	new_username = StringField("New Username", [InputRequired()])
-	package = StringField("Package", [Optional()])
-	remove_maintainer = BooleanField("Remove current owner from maintainers")
-	submit = SubmitField("Transfer")
-
-
-def perform_transfer(form: TransferPackageForm):
-	query = Package.query.filter(Package.author.has(username=form.old_username.data))
-	if nonempty_or_none(form.package.data):
-		query = query.filter_by(name=form.package.data)
-
-	packages = query.all()
-	if len(packages) == 0:
-		flash("Unable to find package(s)", "danger")
-		return
-
-	new_user = User.query.filter_by(username=form.new_username.data).first()
-	if new_user is None:
-		flash("Unable to find new user", "danger")
-		return
-
-	names = [x.name for x in packages]
-	already_existing = Package.query.filter(Package.author_id == new_user.id, Package.name.in_(names)).all()
-	if len(already_existing) > 0:
-		existing_names = [x.name for x in already_existing]
-		flash("Unable to transfer packages as names exist at destination: " + ", ".join(existing_names), "danger")
-		return
-
-	for package in packages:
-		if form.remove_maintainer.data:
-			package.maintainers.remove(package.author)
-		package.author = new_user
-		package.maintainers.append(new_user)
-		package.aliases.append(PackageAlias(form.old_username.data, package.name))
-
-		add_audit_log(AuditSeverity.MODERATION, current_user,
-				f"Transferred {form.old_username.data}/{package.name} to {form.new_username.data}",
-				package.get_url("packages.view"), package)
-
-	db.session.commit()
-
-	flash("Transferred " + ", ".join([x.name for x in packages]), "success")
-
-	return redirect(url_for("admin.transfer"))
-
-
-@bp.route("/admin/transfer/", methods=["GET", "POST"])
-@rank_required(UserRank.MODERATOR)
-def transfer():
-	form = TransferPackageForm(formdata=request.form)
-	if form.validate_on_submit():
-		ret = perform_transfer(form)
-		if ret is not None:
-			return ret
-
-	# Process GET or invalid POST
-	return render_template("admin/transfer.html", form=form)

app/blueprints/admin/audit.py

@@ -15,9 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 from flask import render_template, request, abort
-from flask_login import current_user, login_required
-
-from app.models import db, AuditLogEntry, UserRank, User, Permission
+from app.models import db, AuditLogEntry, UserRank, User
 from app.utils import rank_required, get_int_or_abort
 
 from . import bp
@@ -37,15 +35,12 @@ def audit():
 			abort(404)
 		query = query.filter_by(causer=user)
 
-	pagination = query.paginate(page=page, per_page=num)
+	pagination = query.paginate(page, num, True)
 	return render_template("admin/audit.html", log=pagination.items, pagination=pagination)
 
 
-@bp.route("/admin/audit/<int:id_>/")
-@login_required
-def audit_view(id_):
-	entry: AuditLogEntry = AuditLogEntry.query.get_or_404(id_)
-	if not entry.check_perm(current_user, Permission.VIEW_AUDIT_DESCRIPTION):
-		abort(403)
-
+@bp.route("/admin/audit/<int:id>/")
+@rank_required(UserRank.MODERATOR)
+def audit_view(id):
+	entry = AuditLogEntry.query.get(id)
 	return render_template("admin/audit_view.html", entry=entry)

app/blueprints/admin/email.py

@@ -14,17 +14,18 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from flask import request, abort, url_for, redirect, render_template, flash
+
+from flask import *
 from flask_login import current_user
 from flask_wtf import FlaskForm
-from wtforms import TextAreaField, SubmitField, StringField
-from wtforms.validators import InputRequired, Length
+from wtforms import *
+from wtforms.validators import *
 
-from app.markdown import render_markdown
-from app.tasks.emails import send_user_email, send_bulk_email as task_send_bulk
-from app.utils import rank_required, add_audit_log
+from app.utils.markdown import render_markdown
+from app.models import *
+from app.tasks.emails import send_user_email
+from app.utils import rank_required, addAuditLog
 from . import bp
-from app.models import UserRank, User, AuditSeverity
 
 
 class SendEmailForm(FlaskForm):
@@ -49,12 +50,12 @@ def send_single_email():
 
 	form = SendEmailForm(request.form)
 	if form.validate_on_submit():
-		add_audit_log(AuditSeverity.MODERATION, current_user,
+		addAuditLog(AuditSeverity.MODERATION, current_user,
 				"Sent email to {}".format(user.display_name), url_for("users.profile", username=username))
 
 		text = form.text.data
 		html = render_markdown(text)
-		task = send_user_email.delay(user.email, user.locale or "en", form.subject.data, text, html)
+		task = send_user_email.delay(user.email, form.subject.data, text, html)
 		return redirect(url_for("tasks.check", id=task.id, r=next_url))
 
 	return render_template("admin/send_email.html", form=form, user=user)
@@ -65,12 +66,13 @@ def send_single_email():
 def send_bulk_email():
 	form = SendEmailForm(request.form)
 	if form.validate_on_submit():
-		add_audit_log(AuditSeverity.MODERATION, current_user,
-				"Sent bulk email", url_for("admin.admin_page"), None, form.text.data)
+		addAuditLog(AuditSeverity.MODERATION, current_user,
+				"Sent bulk email", None, None, form.text.data)
 
 		text = form.text.data
 		html = render_markdown(text)
-		task_send_bulk.delay(form.subject.data, text, html)
+		for user in User.query.filter(User.email != None).all():
+			send_user_email.delay(user.email, form.subject.data, text, html)
 
 		return redirect(url_for("admin.admin_page"))
 

app/blueprints/admin/licenseseditor.py

@@ -15,15 +15,14 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-from flask import redirect, render_template, abort, url_for, request, flash
-from flask_login import current_user
+from flask import *
 from flask_wtf import FlaskForm
-from wtforms import StringField, BooleanField, SubmitField, URLField
-from wtforms.validators import InputRequired, Length, Optional
+from wtforms import *
+from wtforms.validators import *
 
-from app.utils import rank_required, nonempty_or_none, add_audit_log
+from app.models import *
+from app.utils import rank_required
 from . import bp
-from app.models import UserRank, License, db, AuditSeverity
 
 
 @bp.route("/licenses/")
@@ -31,13 +30,10 @@ from app.models import UserRank, License, db, AuditSeverity
 def license_list():
 	return render_template("admin/licenses/list.html", licenses=License.query.order_by(db.asc(License.name)).all())
 
-
 class LicenseForm(FlaskForm):
-	name = StringField("Name", [InputRequired(), Length(3, 100)])
-	is_foss = BooleanField("Is FOSS")
-	url = URLField("URL", [Optional()], filters=[nonempty_or_none])
-	submit = SubmitField("Save")
-
+	name	 = StringField("Name", [InputRequired(), Length(3,100)])
+	is_foss  = BooleanField("Is FOSS")
+	submit   = SubmitField("Save")
 
 @bp.route("/licenses/new/", methods=["GET", "POST"])
 @bp.route("/licenses/<name>/edit/", methods=["GET", "POST"])
@@ -57,15 +53,9 @@ def create_edit_license(name=None):
 			license = License(form.name.data)
 			db.session.add(license)
 			flash("Created license " + form.name.data, "success")
-
-			add_audit_log(AuditSeverity.MODERATION, current_user, f"Created license {license.name}",
-						  url_for("admin.license_list"))
 		else:
 			flash("Updated license " + form.name.data, "success")
 
-			add_audit_log(AuditSeverity.MODERATION, current_user, f"Edited license {license.name}",
-						  url_for("admin.license_list"))
-
 		form.populate_obj(license)
 		db.session.commit()
 		return redirect(url_for("admin.license_list"))

app/blueprints/admin/tagseditor.py

@@ -15,15 +15,14 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-from flask import redirect, render_template, abort, url_for, request
+from flask import *
 from flask_login import current_user, login_required
 from flask_wtf import FlaskForm
-from wtforms import StringField, TextAreaField, BooleanField, SubmitField
-from wtforms.validators import InputRequired, Length, Optional, Regexp
+from wtforms import *
+from wtforms.validators import *
 
+from app.models import *
 from . import bp
-from app.models import Permission, Tag, db, AuditSeverity
-from app.utils import add_audit_log
 
 
 @bp.route("/tags/")
@@ -41,14 +40,11 @@ def tag_list():
 
 	return render_template("admin/tags/list.html", tags=query.all())
 
-
 class TagForm(FlaskForm):
-	title = StringField("Title", [InputRequired(), Length(3, 100)])
+	title	    = StringField("Title", [InputRequired(), Length(3,100)])
 	description = TextAreaField("Description", [Optional(), Length(0, 500)])
-	name = StringField("Name", [Optional(), Length(1, 20), Regexp("^[a-z0-9_]", 0,
-			"Lower case letters (a-z), digits (0-9), and underscores (_) only")])
-	submit = SubmitField("Save")
-
+	name        = StringField("Name", [Optional(), Length(1, 20), Regexp("^[a-z0-9_]", 0, "Lower case letters (a-z), digits (0-9), and underscores (_) only")])
+	submit      = SubmitField("Save")
 
 @bp.route("/tags/new/", methods=["GET", "POST"])
 @bp.route("/tags/<name>/edit/", methods=["GET", "POST"])
@@ -60,24 +56,17 @@ def create_edit_tag(name=None):
 		if tag is None:
 			abort(404)
 
-	if not Permission.check_perm(current_user, Permission.EDIT_TAGS if tag else Permission.CREATE_TAG):
+	if not Permission.checkPerm(current_user, Permission.EDIT_TAGS if tag else Permission.CREATE_TAG):
 		abort(403)
 
-	form = TagForm(obj=tag)
+	form = TagForm(formdata=request.form, obj=tag)
 	if form.validate_on_submit():
 		if tag is None:
 			tag = Tag(form.title.data)
 			tag.description = form.description.data
 			db.session.add(tag)
-
-			add_audit_log(AuditSeverity.EDITOR, current_user, f"Created tag {tag.name}",
-						  url_for("admin.create_edit_tag", name=tag.name))
 		else:
 			form.populate_obj(tag)
-
-			add_audit_log(AuditSeverity.EDITOR, current_user, f"Edited tag {tag.name}",
-						  url_for("admin.create_edit_tag", name=tag.name))
-
 		db.session.commit()
 
 		if Permission.EDIT_TAGS.check(current_user):

app/blueprints/admin/versioneditor.py

@@ -15,29 +15,25 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-from flask import redirect, render_template, abort, url_for, request, flash
-from flask_login import current_user
+from flask import *
 from flask_wtf import FlaskForm
-from wtforms import StringField, IntegerField, SubmitField
-from wtforms.validators import InputRequired, Length
+from wtforms import *
+from wtforms.validators import *
 
-from app.utils import rank_required, add_audit_log
+from app.models import *
+from app.utils import rank_required
 from . import bp
-from app.models import UserRank, MinetestRelease, db, AuditSeverity
 
 
 @bp.route("/versions/")
 @rank_required(UserRank.MODERATOR)
 def version_list():
-	return render_template("admin/versions/list.html",
-			versions=MinetestRelease.query.order_by(db.asc(MinetestRelease.id)).all())
-
+	return render_template("admin/versions/list.html", versions=MinetestRelease.query.order_by(db.asc(MinetestRelease.id)).all())
 
 class VersionForm(FlaskForm):
-	name = StringField("Name", [InputRequired(), Length(3, 100)])
+	name	 = StringField("Name", [InputRequired(), Length(3,100)])
 	protocol = IntegerField("Protocol")
-	submit = SubmitField("Save")
-
+	submit   = SubmitField("Save")
 
 @bp.route("/versions/new/", methods=["GET", "POST"])
 @bp.route("/versions/<name>/edit/", methods=["GET", "POST"])
@@ -55,15 +51,9 @@ def create_edit_version(name=None):
 			version = MinetestRelease(form.name.data)
 			db.session.add(version)
 			flash("Created version " + form.name.data, "success")
-
-			add_audit_log(AuditSeverity.MODERATION, current_user, f"Created version {version.name}",
-						  url_for("admin.license_list"))
 		else:
 			flash("Updated version " + form.name.data, "success")
 
-			add_audit_log(AuditSeverity.MODERATION, current_user, f"Edited version {version.name}",
-						  url_for("admin.version_list"))
-
 		form.populate_obj(version)
 		db.session.commit()
 		return redirect(url_for("admin.version_list"))

app/blueprints/admin/warningseditor.py

@@ -15,14 +15,14 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-from flask import redirect, render_template, abort, url_for, request
+from flask import *
 from flask_wtf import FlaskForm
-from wtforms import StringField, TextAreaField, SubmitField
-from wtforms.validators import InputRequired, Length, Optional, Regexp
+from wtforms import *
+from wtforms.validators import *
 
+from app.models import *
 from app.utils import rank_required
 from . import bp
-from app.models import UserRank, ContentWarning, db
 
 
 @bp.route("/admin/warnings/")
@@ -30,14 +30,11 @@ from app.models import UserRank, ContentWarning, db
 def warning_list():
 	return render_template("admin/warnings/list.html", warnings=ContentWarning.query.order_by(db.asc(ContentWarning.title)).all())
 
-
 class WarningForm(FlaskForm):
-	title = StringField("Title", [InputRequired(), Length(3, 100)])
+	title	    = StringField("Title", [InputRequired(), Length(3,100)])
 	description = TextAreaField("Description", [Optional(), Length(0, 500)])
-	name = StringField("Name", [Optional(), Length(1, 20),
-					Regexp("^[a-z0-9_]", 0, "Lower case letters (a-z), digits (0-9), and underscores (_) only")])
-	submit = SubmitField("Save")
-
+	name        = StringField("Name", [Optional(), Length(1, 20), Regexp("^[a-z0-9_]", 0, "Lower case letters (a-z), digits (0-9), and underscores (_) only")])
+	submit      = SubmitField("Save")
 
 @bp.route("/admin/warnings/new/", methods=["GET", "POST"])
 @bp.route("/admin/warnings/<name>/edit/", methods=["GET", "POST"])

app/blueprints/api/endpoints.py

@@ -14,109 +14,44 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import math
-from functools import wraps
-from typing import List
-
-import flask_sqlalchemy
-from flask import request, jsonify, current_app, Response
+from flask import request, jsonify, current_app, abort
 from flask_login import current_user, login_required
-from sqlalchemy import and_, or_
-from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import func
 
 from app import csrf
-from app.logic.graphs import get_package_stats, get_package_stats_for_user, get_all_package_stats
-from app.markdown import render_markdown
-from app.models import Tag, PackageState, PackageType, Package, db, PackageRelease, Permission, ForumTopic, \
-	MinetestRelease, APIToken, PackageScreenshot, License, ContentWarning, User, PackageReview, Thread, Collection, \
-	PackageAlias
+from app.utils.markdown import render_markdown
+from app.models import Tag, PackageState, PackageType, Package, db, PackageRelease, Permission, ForumTopic, MinetestRelease, APIToken, PackageScreenshot, License, ContentWarning
 from app.querybuilder import QueryBuilder
-from app.utils import is_package_page, get_int_or_abort, url_set_query, abs_url, is_yes, get_request_date
+from app.utils import is_package_page
 from . import bp
 from .auth import is_api_authd
-from .support import error, api_create_vcs_release, api_create_zip_release, api_create_screenshot, \
-	api_order_screenshots, api_edit_package, api_set_cover_image
-from app.utils.minetest_hypertext import html_to_minetest
-
-
-def cors_allowed(f):
-	@wraps(f)
-	def inner(*args, **kwargs):
-		res: Response = f(*args, **kwargs)
-		res.headers["Access-Control-Allow-Origin"] = "*"
-		res.headers["Access-Control-Allow-Methods"] = "GET, POST, PUT, DELETE, OPTIONS"
-		res.headers["Access-Control-Allow-Headers"] = "Content-Type, Authorization"
-		return res
-	return inner
-
-
-def cached(max_age: int):
-	def decorator(f):
-		@wraps(f)
-		def inner(*args, **kwargs):
-			res: Response = f(*args, **kwargs)
-			res.cache_control.max_age = max_age
-			return res
-		return inner
-
-	return decorator
+from .support import error, api_create_vcs_release, api_create_zip_release, api_create_screenshot, api_order_screenshots, api_edit_package
 
 
 @bp.route("/api/packages/")
-@cors_allowed
-@cached(300)
 def packages():
-	qb = QueryBuilder(request.args)
-	query = qb.build_package_query()
+	qb    = QueryBuilder(request.args)
+	query = qb.buildPackageQuery()
 
 	if request.args.get("fmt") == "keys":
-		return jsonify([pkg.as_key_dict() for pkg in query.all()])
+		return jsonify([package.getAsDictionaryKey() for package in query.all()])
 
-	pkgs = qb.convert_to_dictionary(query.all())
+	pkgs = qb.convertToDictionary(query.all())
 	if "engine_version" in request.args or "protocol_version" in request.args:
-		pkgs = [pkg for pkg in pkgs if pkg.get("release")]
-
-	# Promote featured packages
-	if "sort" not in request.args and \
-			"order" not in request.args and \
-			"q" not in request.args and \
-			"limit" not in request.args:
-		featured_lut = set()
-		featured = qb.convert_to_dictionary(query.filter(
-			Package.collections.any(and_(Collection.name == "featured", Collection.author.has(username="ContentDB")))).all())
-		for pkg in featured:
-			featured_lut.add(f"{pkg['author']}/{pkg['name']}")
-			pkg["short_description"] = "Featured. " + pkg["short_description"]
-
-		not_featured = [pkg for pkg in pkgs if f"{pkg['author']}/{pkg['name']}" not in featured_lut]
-		pkgs = featured + not_featured
-
+		pkgs = [package for package in pkgs if package.get("release")]
 	return jsonify(pkgs)
 
 
 @bp.route("/api/packages/<author>/<name>/")
 @is_package_page
-@cors_allowed
-def package_view(package):
-	return jsonify(package.as_dict(current_app.config["BASE_URL"]))
-
-
-@bp.route("/api/packages/<author>/<name>/hypertext/")
-@is_package_page
-@cors_allowed
-def package_hypertext(package):
-	formspec_version = request.args["formspec_version"]
-	include_images = is_yes(request.args.get("include_images", "true"))
-	html = render_markdown(package.desc)
-	return jsonify(html_to_minetest(html, formspec_version, include_images))
+def package(package):
+	return jsonify(package.getAsDictionary(current_app.config["BASE_URL"]))
 
 
 @bp.route("/api/packages/<author>/<name>/", methods=["PUT"])
 @csrf.exempt
 @is_package_page
 @is_api_authd
-@cors_allowed
 def edit_package(token, package):
 	if not token:
 		error(401, "Authentication needed")
@@ -124,16 +59,13 @@ def edit_package(token, package):
 	return api_edit_package(token, package, request.json)
 
 
-def resolve_package_deps(out, package, only_hard, depth=1):
-	id_ = package.get_id()
-	if id_ in out:
+def resolve_package_deps(out, package, only_hard):
+	id = package.getId()
+	if id in out:
 		return
 
 	ret = []
-	out[id_] = ret
-
-	if package.type != PackageType.MOD:
-		return
+	out[id] = ret
 
 	for dep in package.dependencies:
 		if only_hard and dep.optional:
@@ -141,18 +73,13 @@ def resolve_package_deps(out, package, only_hard, depth=1):
 
 		if dep.package:
 			name = dep.package.name
-			fulfilled_by = [ dep.package.get_id() ]
-			resolve_package_deps(out, dep.package, only_hard, depth)
+			fulfilled_by = [ dep.package.getId() ]
+			resolve_package_deps(out, dep.package, only_hard)
 
 		elif dep.meta_package:
 			name = dep.meta_package.name
-			fulfilled_by = [ pkg.get_id() for pkg in dep.meta_package.packages if pkg.state == PackageState.APPROVED]
-
-			if depth == 1 and not dep.optional:
-				most_likely = next((pkg for pkg in dep.meta_package.packages \
-						if pkg.type == PackageType.MOD and pkg.state == PackageState.APPROVED), None)
-				if most_likely:
-					resolve_package_deps(out, most_likely, only_hard, depth + 1)
+			fulfilled_by = [ pkg.getId() for pkg in dep.meta_package.packages]
+			# TODO: resolve most likely candidate
 
 		else:
 			raise Exception("Malformed dependency")
@@ -166,7 +93,6 @@ def resolve_package_deps(out, package, only_hard, depth=1):
 
 @bp.route("/api/packages/<author>/<name>/dependencies/")
 @is_package_page
-@cors_allowed
 def package_dependencies(package):
 	only_hard = request.args.get("only_hard")
 
@@ -177,11 +103,10 @@ def package_dependencies(package):
 
 
 @bp.route("/api/topics/")
-@cors_allowed
 def topics():
-	qb = QueryBuilder(request.args)
-	query = qb.build_topic_query(show_added=True)
-	return jsonify([t.as_dict() for t in query.all()])
+	qb     = QueryBuilder(request.args)
+	query  = qb.buildTopicQuery(show_added=True)
+	return jsonify([t.getAsDictionary() for t in query.all()])
 
 
 @bp.route("/api/topic_discard/", methods=["POST"])
@@ -190,21 +115,20 @@ def topic_set_discard():
 	tid = request.args.get("tid")
 	discard = request.args.get("discard")
 	if tid is None or discard is None:
-		error(400, "Missing topic ID or discard bool")
+		abort(400)
 
 	topic = ForumTopic.query.get(tid)
-	if not topic.check_perm(current_user, Permission.TOPIC_DISCARD):
-		error(403, "Permission denied, need: TOPIC_DISCARD")
+	if not topic.checkPerm(current_user, Permission.TOPIC_DISCARD):
+		abort(403)
 
 	topic.discarded = discard == "true"
 	db.session.commit()
 
-	return jsonify(topic.as_dict())
+	return jsonify(topic.getAsDictionary())
 
 
 @bp.route("/api/whoami/")
 @is_api_authd
-@cors_allowed
 def whoami(token):
 	if token is None:
 		return jsonify({ "is_authenticated": False, "username": None })
@@ -212,73 +136,30 @@ def whoami(token):
 		return jsonify({ "is_authenticated": True, "username": token.owner.username })
 
 
-@bp.route("/api/delete-token/", methods=["DELETE"])
-@csrf.exempt
-@is_api_authd
-@cors_allowed
-def api_delete_token(token):
-	if token is None:
-		error(404, "Token not found")
-
-	db.session.delete(token)
-	db.session.commit()
-
-	return jsonify({"success": True})
-
-
 @bp.route("/api/markdown/", methods=["POST"])
 @csrf.exempt
 def markdown():
 	return render_markdown(request.data.decode("utf-8"))
 
 
-@bp.route("/api/releases/")
-@cors_allowed
-def list_all_releases():
-	query = PackageRelease.query.filter_by(approved=True) \
-			.filter(PackageRelease.package.has(state=PackageState.APPROVED)) \
-			.order_by(db.desc(PackageRelease.releaseDate))
-
-	if "author" in request.args:
-		author = User.query.filter_by(username=request.args["author"]).first()
-		if author is None:
-			error(404, "Author not found")
-		query = query.filter(PackageRelease.package.has(author=author))
-
-	if "maintainer" in request.args:
-		maintainer = User.query.filter_by(username=request.args["maintainer"]).first()
-		if maintainer is None:
-			error(404, "Maintainer not found")
-		query = query.join(Package)
-		query = query.filter(Package.maintainers.contains(maintainer))
-
-	return jsonify([ rel.as_long_dict() for rel in query.limit(30).all() ])
-
-
 @bp.route("/api/packages/<author>/<name>/releases/")
 @is_package_page
-@cors_allowed
 def list_releases(package):
-	return jsonify([ rel.as_dict() for rel in package.releases.all() ])
+	return jsonify([ rel.getAsDictionary() for rel in package.releases.all() ])
 
 
 @bp.route("/api/packages/<author>/<name>/releases/new/", methods=["POST"])
 @csrf.exempt
 @is_package_page
 @is_api_authd
-@cors_allowed
 def create_release(token, package):
 	if not token:
 		error(401, "Authentication needed")
 
-	if not package.check_perm(token.owner, Permission.APPROVE_RELEASE):
+	if not package.checkPerm(token.owner, Permission.APPROVE_RELEASE):
 		error(403, "You do not have the permission to approve releases")
 
-	if request.headers.get("Content-Type") == "application/json":
-		data = request.json
-	else:
-		data = request.form
-
+	data = request.json or request.form
 	if "title" not in data:
 		error(400, "Title is required in the POST data")
 
@@ -294,9 +175,7 @@ def create_release(token, package):
 		if file is None:
 			error(400, "Missing 'file' in multipart body")
 
-		commit_hash = data.get("commit")
-
-		return api_create_zip_release(token, package, data["title"], file, None, None, "API", commit_hash)
+		return api_create_zip_release(token, package, data["title"], file)
 
 	else:
 		error(400, "Unknown release-creation method. Specify the method or provide a file.")
@@ -304,20 +183,18 @@ def create_release(token, package):
 
 @bp.route("/api/packages/<author>/<name>/releases/<int:id>/")
 @is_package_page
-@cors_allowed
-def release_view(package: Package, id: int):
+def release(package: Package, id: int):
 	release = PackageRelease.query.get(id)
 	if release is None or release.package != package:
 		error(404, "Release not found")
 
-	return jsonify(release.as_dict())
+	return jsonify(release.getAsDictionary())
 
 
 @bp.route("/api/packages/<author>/<name>/releases/<int:id>/", methods=["DELETE"])
 @csrf.exempt
 @is_package_page
 @is_api_authd
-@cors_allowed
 def delete_release(token: APIToken, package: Package, id: int):
 	release = PackageRelease.query.get(id)
 	if release is None or release.package != package:
@@ -326,10 +203,10 @@ def delete_release(token: APIToken, package: Package, id: int):
 	if not token:
 		error(401, "Authentication needed")
 
-	if not token.can_operate_on_package(package):
+	if not token.canOperateOnPackage(package):
 		error(403, "API token does not have access to the package")
 
-	if not release.check_perm(token.owner, Permission.DELETE_RELEASE):
+	if not release.checkPerm(token.owner, Permission.DELETE_RELEASE):
 		error(403, "Unable to delete the release, make sure there's a newer release available")
 
 	db.session.delete(release)
@@ -340,22 +217,20 @@ def delete_release(token: APIToken, package: Package, id: int):
 
 @bp.route("/api/packages/<author>/<name>/screenshots/")
 @is_package_page
-@cors_allowed
 def list_screenshots(package):
 	screenshots = package.screenshots.all()
-	return jsonify([ss.as_dict(current_app.config["BASE_URL"]) for ss in screenshots])
+	return jsonify([ss.getAsDictionary(current_app.config["BASE_URL"]) for ss in screenshots])
 
 
 @bp.route("/api/packages/<author>/<name>/screenshots/new/", methods=["POST"])
 @csrf.exempt
 @is_package_page
 @is_api_authd
-@cors_allowed
 def create_screenshot(token: APIToken, package: Package):
 	if not token:
 		error(401, "Authentication needed")
 
-	if not package.check_perm(token.owner, Permission.ADD_SCREENSHOTS):
+	if not package.checkPerm(token.owner, Permission.ADD_SCREENSHOTS):
 		error(403, "You do not have the permission to create screenshots")
 
 	data = request.form
@@ -366,25 +241,23 @@ def create_screenshot(token: APIToken, package: Package):
 	if file is None:
 		error(400, "Missing 'file' in multipart body")
 
-	return api_create_screenshot(token, package, data["title"], file, is_yes(data.get("is_cover_image")))
+	return api_create_screenshot(token, package, data["title"], file)
 
 
 @bp.route("/api/packages/<author>/<name>/screenshots/<int:id>/")
 @is_package_page
-@cors_allowed
 def screenshot(package, id):
 	ss = PackageScreenshot.query.get(id)
 	if ss is None or ss.package != package:
 		error(404, "Screenshot not found")
 
-	return jsonify(ss.as_dict(current_app.config["BASE_URL"]))
+	return jsonify(ss.getAsDictionary(current_app.config["BASE_URL"]))
 
 
 @bp.route("/api/packages/<author>/<name>/screenshots/<int:id>/", methods=["DELETE"])
 @csrf.exempt
 @is_package_page
 @is_api_authd
-@cors_allowed
 def delete_screenshot(token: APIToken, package: Package, id: int):
 	ss = PackageScreenshot.query.get(id)
 	if ss is None or ss.package != package:
@@ -393,10 +266,10 @@ def delete_screenshot(token: APIToken, package: Package, id: int):
 	if not token:
 		error(401, "Authentication needed")
 
-	if not package.check_perm(token.owner, Permission.ADD_SCREENSHOTS):
+	if not package.checkPerm(token.owner, Permission.ADD_SCREENSHOTS):
 		error(403, "You do not have the permission to delete screenshots")
 
-	if not token.can_operate_on_package(package):
+	if not token.canOperateOnPackage(package):
 		error(403, "API token does not have access to the package")
 
 	if package.cover_image == ss:
@@ -413,15 +286,14 @@ def delete_screenshot(token: APIToken, package: Package, id: int):
 @csrf.exempt
 @is_package_page
 @is_api_authd
-@cors_allowed
 def order_screenshots(token: APIToken, package: Package):
 	if not token:
 		error(401, "Authentication needed")
 
-	if not package.check_perm(token.owner, Permission.ADD_SCREENSHOTS):
-		error(403, "You do not have the permission to change screenshots")
+	if not package.checkPerm(token.owner, Permission.ADD_SCREENSHOTS):
+		error(403, "You do not have the permission to delete screenshots")
 
-	if not token.can_operate_on_package(package):
+	if not token.canOperateOnPackage(package):
 		error(403, "API token does not have access to the package")
 
 	json = request.json
@@ -431,134 +303,37 @@ def order_screenshots(token: APIToken, package: Package):
 	return api_order_screenshots(token, package, request.json)
 
 
-@bp.route("/api/packages/<author>/<name>/screenshots/cover-image/", methods=["POST"])
-@csrf.exempt
-@is_package_page
-@is_api_authd
-@cors_allowed
-def set_cover_image(token: APIToken, package: Package):
-	if not token:
-		error(401, "Authentication needed")
-
-	if not package.check_perm(token.owner, Permission.ADD_SCREENSHOTS):
-		error(403, "You do not have the permission to change screenshots")
-
-	if not token.can_operate_on_package(package):
-		error(403, "API token does not have access to the package")
-
-	json = request.json
-	if json is None or not isinstance(json, dict) or "cover_image" not in json:
-		error(400, "Expected body to be an object with cover_image as a key")
-
-	return api_set_cover_image(token, package, request.json["cover_image"])
-
-
-@bp.route("/api/packages/<author>/<name>/reviews/")
-@is_package_page
-@cors_allowed
-def list_reviews(package):
-	reviews = package.reviews
-	return jsonify([review.as_dict() for review in reviews])
-
-
-@bp.route("/api/reviews/")
-@cors_allowed
-def list_all_reviews():
-	page = get_int_or_abort(request.args.get("page"), 1)
-	num = min(get_int_or_abort(request.args.get("n"), 100), 200)
-
-	query = PackageReview.query
-	query = query.options(joinedload(PackageReview.author), joinedload(PackageReview.package))
-
-	if "for_user" in request.args:
-		query = query.filter(PackageReview.package.has(Package.author.has(username=request.args["for_user"])))
-
-	if "author" in request.args:
-		query = query.filter(PackageReview.author.has(User.username == request.args.get("author")))
-
-	if "is_positive" in request.args:
-		if is_yes(request.args.get("is_positive")):
-			query = query.filter(PackageReview.rating > 3)
-		else:
-			query = query.filter(PackageReview.rating <= 3)
-
-	q = request.args.get("q")
-	if q:
-		query = query.filter(PackageReview.thread.has(Thread.title.ilike(f"%{q}%")))
-
-	query = query.order_by(db.desc(PackageReview.created_at))
-
-	pagination: flask_sqlalchemy.Pagination = query.paginate(page=page, per_page=num)
-	return jsonify({
-		"page": pagination.page,
-		"per_page": pagination.per_page,
-		"page_count": math.ceil(pagination.total / pagination.per_page),
-		"total": pagination.total,
-		"urls": {
-			"previous": abs_url(url_set_query(page=page - 1)) if pagination.has_prev else None,
-			"next": abs_url(url_set_query(page=page + 1)) if pagination.has_next else None,
-		},
-		"items": [review.as_dict(True) for review in pagination.items],
-	})
-
-
-@bp.route("/api/packages/<author>/<name>/stats/")
-@is_package_page
-@cors_allowed
-@cached(300)
-def package_stats(package: Package):
-	start = get_request_date("start")
-	end = get_request_date("end")
-	return jsonify(get_package_stats(package, start, end))
-
-
-@bp.route("/api/package_stats/")
-@cors_allowed
-@cached(900)
-def all_package_stats():
-	return jsonify(get_all_package_stats())
-
-
 @bp.route("/api/scores/")
-@cors_allowed
-@cached(300)
 def package_scores():
-	qb = QueryBuilder(request.args)
-	query = qb.build_package_query()
+	qb    = QueryBuilder(request.args)
+	query = qb.buildPackageQuery()
 
-	pkgs = [package.as_score_dict() for package in query.all()]
+	pkgs = [package.getScoreDict() for package in query.all()]
 	return jsonify(pkgs)
 
 
 @bp.route("/api/tags/")
-@cors_allowed
 def tags():
-	return jsonify([tag.as_dict() for tag in Tag.query.all() ])
+	return jsonify([tag.getAsDictionary() for tag in Tag.query.all() ])
 
 
 @bp.route("/api/content_warnings/")
-@cors_allowed
 def content_warnings():
-	return jsonify([warning.as_dict() for warning in ContentWarning.query.all() ])
+	return jsonify([warning.getAsDictionary() for warning in ContentWarning.query.all() ])
 
 
 @bp.route("/api/licenses/")
-@cors_allowed
 def licenses():
-	all_licenses = License.query.order_by(db.asc(License.name)).all()
-	return jsonify([{"name": license.name, "is_foss": license.is_foss} for license in all_licenses])
+	return jsonify([ { "name": license.name, "is_foss": license.is_foss } \
+		for license in License.query.order_by(db.asc(License.name)).all() ])
 
 
 @bp.route("/api/homepage/")
-@cors_allowed
 def homepage():
-	query = Package.query.filter_by(state=PackageState.APPROVED)
-	count = query.count()
+	query   = Package.query.filter_by(state=PackageState.APPROVED)
+	count   = query.count()
 
-	spotlight = query.filter(
-			Package.collections.any(and_(Collection.name == "spotlight", Collection.author.has(username="ContentDB")))) \
-		.order_by(func.random()).limit(6).all()
-	new = query.order_by(db.desc(Package.approved_at)).limit(4).all()
+	new     = query.order_by(db.desc(Package.approved_at)).limit(4).all()
 	pop_mod = query.filter_by(type=PackageType.MOD).order_by(db.desc(Package.score)).limit(8).all()
 	pop_gam = query.filter_by(type=PackageType.GAME).order_by(db.desc(Package.score)).limit(8).all()
 	pop_txp = query.filter_by(type=PackageType.TXP).order_by(db.desc(Package.score)).limit(8).all()
@@ -574,327 +349,22 @@ def homepage():
 	downloads_result = db.session.query(func.sum(Package.downloads)).one_or_none()
 	downloads = 0 if not downloads_result or not downloads_result[0] else downloads_result[0]
 
-	def map_packages(packages: List[Package]):
-		return [pkg.as_short_dict(current_app.config["BASE_URL"]) for pkg in packages]
+	def mapPackages(packages):
+		return [pkg.getAsDictionaryKey() for pkg in packages]
 
-	return jsonify({
+	return {
 		"count": count,
 		"downloads": downloads,
-		"spotlight": map_packages(spotlight),
-		"new": map_packages(new),
-		"updated": map_packages(updated),
-		"pop_mod": map_packages(pop_mod),
-		"pop_txp": map_packages(pop_txp),
-		"pop_game": map_packages(pop_gam),
-		"high_reviewed": map_packages(high_reviewed)
-	})
-
-
-@bp.route("/api/welcome/v1/")
-@cors_allowed
-def welcome_v1():
-	featured = Package.query \
-		.filter(Package.type == PackageType.GAME, Package.state == PackageState.APPROVED,
-				Package.collections.any(
-					and_(Collection.name == "featured", Collection.author.has(username="ContentDB")))) \
-		.order_by(func.random()) \
-		.limit(5).all()
-
-	def map_packages(packages: List[Package]):
-		return [pkg.as_short_dict(current_app.config["BASE_URL"]) for pkg in packages]
-
-	return jsonify({
-		"featured": map_packages(featured),
-	})
+		"new": mapPackages(new),
+		"updated": mapPackages(updated),
+		"pop_mod": mapPackages(pop_mod),
+		"pop_txp": mapPackages(pop_txp),
+		"pop_game": mapPackages(pop_gam),
+		"high_reviewed": mapPackages(high_reviewed)
+	}
 
 
 @bp.route("/api/minetest_versions/")
-@cors_allowed
 def versions():
-	protocol_version = request.args.get("protocol_version")
-	engine_version = request.args.get("engine_version")
-	if protocol_version or engine_version:
-		rel = MinetestRelease.get(engine_version, get_int_or_abort(protocol_version))
-		if rel is None:
-			error(404, "No releases found")
-
-		return jsonify(rel.as_dict())
-
-	return jsonify([rel.as_dict() \
-			for rel in MinetestRelease.query.all() if rel.get_actual() is not None])
-
-
-@bp.route("/api/dependencies/")
-@cors_allowed
-def all_deps():
-	qb = QueryBuilder(request.args)
-	query = qb.build_package_query()
-
-	def format_pkg(pkg: Package):
-		return {
-			"type": pkg.type.to_name(),
-			"author": pkg.author.username,
-			"name": pkg.name,
-			"provides": [x.name for x in pkg.provides],
-			"depends": [str(x) for x in pkg.dependencies if not x.optional],
-			"optional_depends": [str(x) for x in pkg.dependencies if x.optional],
-		}
-
-	page = get_int_or_abort(request.args.get("page"), 1)
-	num = min(get_int_or_abort(request.args.get("n"), 100), 300)
-	pagination: flask_sqlalchemy.Pagination = query.paginate(page=page, per_page=num)
-	return jsonify({
-		"page": pagination.page,
-		"per_page": pagination.per_page,
-		"page_count": math.ceil(pagination.total / pagination.per_page),
-		"total": pagination.total,
-		"urls": {
-			"previous": abs_url(url_set_query(page=page - 1)) if pagination.has_prev else None,
-			"next": abs_url(url_set_query(page=page + 1)) if pagination.has_next else None,
-		},
-		"items": [format_pkg(pkg) for pkg in pagination.items],
-	})
-
-
-@bp.route("/api/users/<username>/")
-@cors_allowed
-def user_view(username: str):
-	user = User.query.filter_by(username=username).first()
-	if user is None:
-		error(404, "User not found")
-
-	return jsonify(user.get_dict())
-
-
-@bp.route("/api/users/<username>/stats/")
-@cors_allowed
-def user_stats(username: str):
-	user = User.query.filter_by(username=username).first()
-	if user is None:
-		error(404, "User not found")
-
-	start = get_request_date("start")
-	end = get_request_date("end")
-	return jsonify(get_package_stats_for_user(user, start, end))
-
-
-@bp.route("/api/cdb_schema/")
-@cors_allowed
-def json_schema():
-	tags = Tag.query.all()
-	warnings = ContentWarning.query.all()
-	licenses = License.query.order_by(db.asc(License.name)).all()
-	return jsonify({
-		"title": "CDB Config",
-		"description": "Package Configuration",
-		"type": "object",
-		"$defs": {
-			"license": {
-				"enum": [license.name for license in licenses],
-				"enumDescriptions": [license.is_foss and "FOSS" or "NON-FOSS" for license in licenses]
-			},
-		},
-		"properties": {
-			"type": {
-				"description": "Package Type",
-				"enum": ["MOD", "GAME", "TXP"],
-				"enumDescriptions": ["Mod", "Game", "Texture Pack"]
-			},
-			"title": {
-				"description": "Human-readable title",
-				"type": "string"
-			},
-			"name": {
-				"description": "Technical name (needs permission if already approved).",
-				"type": "string",
-				"pattern": "^[a-z_]+$"
-			},
-			"short_description": {
-				"description": "Package Short Description",
-				"type": ["string", "null"]
-			},
-			"dev_state": {
-				"description": "Development State",
-				"enum": [
-					"WIP",
-					"BETA",
-					"ACTIVELY_DEVELOPED",
-					"MAINTENANCE_ONLY",
-					"AS_IS",
-					"DEPRECATED",
-					"LOOKING_FOR_MAINTAINER"
-				]
-			},
-			"tags": {
-				"description": "Package Tags",
-				"type": "array",
-				"items": {
-					"enum": [tag.name for tag in tags],
-					"enumDescriptions": [tag.title for tag in tags]
-				},
-				"uniqueItems": True,
-			},
-			"content_warnings": {
-				"description": "Package Content Warnings",
-				"type": "array",
-				"items": {
-					"enum": [warning.name for warning in warnings],
-					"enumDescriptions": [warning.title for warning in warnings]
-				},
-				"uniqueItems": True,
-			},
-			"license": {
-				"description": "Package License",
-				"$ref": "#/$defs/license"
-			},
-			"media_license": {
-				"description": "Package Media License",
-				"$ref": "#/$defs/license"
-			},
-			"long_description": {
-				"description": "Package Long Description",
-				"type": ["string", "null"]
-			},
-			"repo": {
-				"description": "Git Repository URL",
-				"type": "string",
-				"format": "uri"
-			},
-			"website": {
-				"description": "Website URL",
-				"type": ["string", "null"],
-				"format": "uri"
-			},
-			"issue_tracker": {
-				"description": "Issue Tracker URL",
-				"type": ["string", "null"],
-				"format": "uri"
-			},
-			"forums": {
-				"description": "Forum Topic ID",
-				"type": ["integer", "null"],
-				"minimum": 0
-			},
-			"video_url": {
-				"description": "URL to a Video",
-				"type": ["string", "null"],
-				"format": "uri"
-			},
-			"donate_url": {
-				"description": "URL to a donation page",
-				"type": ["string", "null"],
-				"format": "uri"
-			},
-		},
-	})
-
-
-@bp.route("/api/hypertext/", methods=["POST"])
-@csrf.exempt
-@cors_allowed
-def hypertext():
-	formspec_version = request.args["formspec_version"]
-	include_images = is_yes(request.args.get("include_images", "true"))
-
-	html = request.data.decode("utf-8")
-	if request.content_type == "text/markdown":
-		html = render_markdown(html)
-
-	return jsonify(html_to_minetest(html, formspec_version, include_images))
-
-
-@bp.route("/api/collections/")
-@cors_allowed
-def collection_list():
-	if "author" in request.args:
-		user = User.query.filter_by(username=request.args["author"]).one_or_404()
-		query = user.collections
-	else:
-		query = Collection.query.order_by(db.asc(Collection.title))
-
-	if "package" in request.args:
-		id_ = request.args["package"]
-		package = Package.get_by_key(id_)
-		if package is None:
-			error(404, f"Package {id_} not found")
-
-		query = query.filter(Collection.packages.contains(package))
-
-	collections = [x.as_short_dict() for x in query.all() if not x.private]
-	return jsonify(collections)
-
-
-@bp.route("/api/collections/<author>/<name>/")
-@cors_allowed
-def collection_view(author, name):
-	collection = Collection.query \
-		.filter(Collection.name == name, Collection.author.has(username=author)) \
-		.one_or_404()
-
-	if not collection.check_perm(current_user, Permission.VIEW_COLLECTION):
-		error(404, "Collection not found")
-
-	items = collection.items
-	if collection.check_perm(current_user, Permission.EDIT_COLLECTION):
-		items = [x for x in items if x.package.check_perm(current_user, Permission.VIEW_PACKAGE)]
-
-	ret = collection.as_dict()
-	ret["items"] = [x.as_dict() for x in items]
-	return jsonify(ret)
-
-
-@bp.route("/api/updates/")
-def updates():
-	protocol_version = get_int_or_abort(request.args.get("protocol_version"))
-	minetest_version = request.args.get("engine_version")
-	if protocol_version or minetest_version:
-		version = MinetestRelease.get(minetest_version, protocol_version)
-	else:
-		version = None
-
-	# Subquery to get the latest release for each package
-	latest_release_query = (db.session.query(
-		PackageRelease.package_id,
-		func.max(PackageRelease.id).label('max_release_id'))
-			.select_from(PackageRelease)
-			.filter(PackageRelease.approved == True))
-
-	if version:
-		latest_release_query = (latest_release_query
-			.filter(or_(PackageRelease.min_rel_id == None,
-				PackageRelease.min_rel_id <= version.id))
-			.filter(or_(PackageRelease.max_rel_id == None,
-				PackageRelease.max_rel_id >= version.id)))
-
-	latest_release_subquery = (
-		latest_release_query
-		.group_by(PackageRelease.package_id)
-		.subquery()
-	)
-
-	# Get package id and latest release
-	query = (db.session.query(User.username, Package.name, latest_release_subquery.c.max_release_id)
-		.select_from(Package)
-		.join(User, Package.author)
-		.join(latest_release_subquery, Package.id == latest_release_subquery.c.package_id)
-		.filter(Package.state == PackageState.APPROVED)
-		.all())
-
-	ret = {}
-	for author_username, package_name, release_id in query:
-		ret[f"{author_username}/{package_name}"] = release_id
-
-	# Get aliases
-	aliases = (db.session.query(PackageAlias.author, PackageAlias.name, User.username, Package.name)
-		.select_from(PackageAlias)
-		.join(Package, PackageAlias.package)
-		.join(User, Package.author)
-		.filter(Package.state == PackageState.APPROVED)
-		.all())
-
-	for old_author, old_name, new_author, new_name in aliases:
-		new_release = ret.get(f"{new_author}/{new_name}")
-		if new_release is not None:
-			ret[f"{old_author}/{old_name}"] = new_release
-
-	return jsonify(ret)
+	return jsonify([rel.getAsDictionary() \
+			for rel in MinetestRelease.query.all() if rel.getActual() is not None])

app/blueprints/api/support.py

@@ -19,14 +19,13 @@ from flask import jsonify, abort, make_response, url_for, current_app
 
 from app.logic.packages import do_edit_package
 from app.logic.releases import LogicError, do_create_vcs_release, do_create_zip_release
-from app.logic.screenshots import do_create_screenshot, do_order_screenshots, do_set_cover_image
+from app.logic.screenshots import do_create_screenshot, do_order_screenshots
 from app.models import APIToken, Package, MinetestRelease, PackageScreenshot
 
 
 def error(code: int, msg: str):
 	abort(make_response(jsonify({ "success": False, "error": msg }), code))
 
-
 # Catches LogicErrors and aborts with JSON error
 def guard(f):
 	def ret(*args, **kwargs):
@@ -40,7 +39,7 @@ def guard(f):
 
 def api_create_vcs_release(token: APIToken, package: Package, title: str, ref: str,
 		min_v: MinetestRelease = None, max_v: MinetestRelease = None, reason="API"):
-	if not token.can_operate_on_package(package):
+	if not token.canOperateOnPackage(package):
 		error(403, "API token does not have access to the package")
 
 	reason += ", token=" + token.name
@@ -50,42 +49,42 @@ def api_create_vcs_release(token: APIToken, package: Package, title: str, ref: s
 	return jsonify({
 		"success": True,
 		"task": url_for("tasks.check", id=rel.task_id),
-		"release": rel.as_dict()
+		"release": rel.getAsDictionary()
 	})
 
 
 def api_create_zip_release(token: APIToken, package: Package, title: str, file,
-		min_v: MinetestRelease = None, max_v: MinetestRelease = None, reason="API", commit_hash: str = None):
-	if not token.can_operate_on_package(package):
+		min_v: MinetestRelease = None, max_v: MinetestRelease = None, reason="API"):
+	if not token.canOperateOnPackage(package):
 		error(403, "API token does not have access to the package")
 
 	reason += ", token=" + token.name
 
-	rel = guard(do_create_zip_release)(token.owner, package, title, file, min_v, max_v, reason, commit_hash)
+	rel = guard(do_create_zip_release)(token.owner, package, title, file, min_v, max_v, reason)
 
 	return jsonify({
 		"success": True,
 		"task": url_for("tasks.check", id=rel.task_id),
-		"release": rel.as_dict()
+		"release": rel.getAsDictionary()
 	})
 
 
-def api_create_screenshot(token: APIToken, package: Package, title: str, file, is_cover_image: bool, reason="API"):
-	if not token.can_operate_on_package(package):
+def api_create_screenshot(token: APIToken, package: Package, title: str, file, reason="API"):
+	if not token.canOperateOnPackage(package):
 		error(403, "API token does not have access to the package")
 
 	reason += ", token=" + token.name
 
-	ss : PackageScreenshot = guard(do_create_screenshot)(token.owner, package, title, file, is_cover_image, reason)
+	ss : PackageScreenshot = guard(do_create_screenshot)(token.owner, package, title, file, reason)
 
 	return jsonify({
 		"success": True,
-		"screenshot": ss.as_dict()
+		"screenshot": ss.getAsDictionary()
 	})
 
 
 def api_order_screenshots(token: APIToken, package: Package, order: [any]):
-	if not token.can_operate_on_package(package):
+	if not token.canOperateOnPackage(package):
 		error(403, "API token does not have access to the package")
 
 	guard(do_order_screenshots)(token.owner, package, order)
@@ -95,26 +94,15 @@ def api_order_screenshots(token: APIToken, package: Package, order: [any]):
 	})
 
 
-def api_set_cover_image(token: APIToken, package: Package, cover_image):
-	if not token.can_operate_on_package(package):
-		error(403, "API token does not have access to the package")
-
-	guard(do_set_cover_image)(token.owner, package, cover_image)
-
-	return jsonify({
-		"success": True
-	})
-
-
 def api_edit_package(token: APIToken, package: Package, data: dict, reason: str = "API"):
-	if not token.can_operate_on_package(package):
+	if not token.canOperateOnPackage(package):
 		error(403, "API token does not have access to the package")
 
 	reason += ", token=" + token.name
 
-	package = guard(do_edit_package)(token.owner, package, False, False, data, reason)
+	package = guard(do_edit_package)(token.owner, package, False, data, reason)
 
 	return jsonify({
 		"success": True,
-		"package": package.as_dict(current_app.config["BASE_URL"])
+		"package": package.getAsDictionary(current_app.config["BASE_URL"])
 	})

app/blueprints/api/tokens.py

@@ -16,24 +16,23 @@
 
 
 from flask import render_template, redirect, request, session, url_for, abort
-from flask_babel import lazy_gettext
 from flask_login import login_required, current_user
 from flask_wtf import FlaskForm
-from wtforms import StringField, SubmitField
-from wtforms.validators import InputRequired, Length
-from wtforms_sqlalchemy.fields import QuerySelectField
+from wtforms import *
+from wtforms.ext.sqlalchemy.fields import QuerySelectField
+from wtforms.validators import *
 
-from app.models import db, User, APIToken, Permission
-from app.utils import random_string
+from app.models import db, User, APIToken, Package, Permission
+from app.utils import randomString
 from . import bp
 from ..users.settings import get_setting_tabs
 
 
 class CreateAPIToken(FlaskForm):
-	name	     = StringField(lazy_gettext("Name"), [InputRequired(), Length(1, 30)])
-	package      = QuerySelectField(lazy_gettext("Limit to package"), allow_blank=True,
+	name	     = StringField("Name", [InputRequired(), Length(1, 30)])
+	package      = QuerySelectField("Limit to package", allow_blank=True,
 			get_pk=lambda a: a.id, get_label=lambda a: a.title)
-	submit	     = SubmitField(lazy_gettext("Save"))
+	submit	     = SubmitField("Save")
 
 
 @bp.route("/user/tokens/")
@@ -49,7 +48,7 @@ def list_tokens(username):
 	if user is None:
 		abort(404)
 
-	if not user.check_perm(current_user, Permission.CREATE_TOKEN):
+	if not user.checkPerm(current_user, Permission.CREATE_TOKEN):
 		abort(403)
 
 	return render_template("api/list_tokens.html", user=user, tabs=get_setting_tabs(user), current_tab="api_tokens")
@@ -63,7 +62,7 @@ def create_edit_token(username, id=None):
 	if user is None:
 		abort(404)
 
-	if not user.check_perm(current_user, Permission.CREATE_TOKEN):
+	if not user.checkPerm(current_user, Permission.CREATE_TOKEN):
 		abort(403)
 
 	is_new = id is None
@@ -72,8 +71,10 @@ def create_edit_token(username, id=None):
 	access_token = None
 	if not is_new:
 		token = APIToken.query.get(id)
-		if token is None or token.owner != user:
+		if token is None:
 			abort(404)
+		elif token.owner != user:
+			abort(403)
 
 		access_token = session.pop("token_" + str(token.id), None)
 
@@ -83,12 +84,12 @@ def create_edit_token(username, id=None):
 	if form.validate_on_submit():
 		if is_new:
 			token = APIToken()
-			db.session.add(token)
 			token.owner = user
-			token.access_token = random_string(32)
+			token.access_token = randomString(32)
 
 		form.populate_obj(token)
-		db.session.commit()
+		db.session.add(token)
+		db.session.commit() # save
 
 		if is_new:
 			# Store token so it can be shown in the edit page
@@ -106,7 +107,7 @@ def reset_token(username, id):
 	if user is None:
 		abort(404)
 
-	if not user.check_perm(current_user, Permission.CREATE_TOKEN):
+	if not user.checkPerm(current_user, Permission.CREATE_TOKEN):
 		abort(403)
 
 	token = APIToken.query.get(id)
@@ -115,7 +116,7 @@ def reset_token(username, id):
 	elif token.owner != user:
 		abort(403)
 
-	token.access_token = random_string(32)
+	token.access_token = randomString(32)
 
 	db.session.commit() # save
 
@@ -132,9 +133,11 @@ def delete_token(username, id):
 	if user is None:
 		abort(404)
 
-	if not user.check_perm(current_user, Permission.CREATE_TOKEN):
+	if not user.checkPerm(current_user, Permission.CREATE_TOKEN):
 		abort(403)
 
+	is_new = id is None
+
 	token = APIToken.query.get(id)
 	if token is None:
 		abort(404)

app/blueprints/collections/__init__.py

@@ -1,377 +0,0 @@
-# ContentDB
-# Copyright (C) 2023 rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import re
-import typing
-
-from flask import Blueprint, request, redirect, render_template, flash, abort, url_for
-from flask_babel import lazy_gettext, gettext
-from flask_login import current_user, login_required
-from flask_wtf import FlaskForm
-from wtforms import StringField, BooleanField, SubmitField, FieldList, HiddenField, TextAreaField
-from wtforms.validators import InputRequired, Length, Optional, Regexp
-
-from app.models import Collection, db, Package, Permission, CollectionPackage, User, UserRank, AuditSeverity
-from app.utils import nonempty_or_none
-from app.utils.models import is_package_page, add_audit_log, create_session
-
-bp = Blueprint("collections", __name__)
-
-
-regex_invalid_chars = re.compile("[^a-z0-9_]")
-
-
-@bp.route("/collections/")
-@bp.route("/collections/<author>/")
-def list_all(author=None):
-	if author:
-		user = User.query.filter_by(username=author).one_or_404()
-		query = user.collections
-	else:
-		user = None
-		query = Collection.query.filter(Collection.items.any()).order_by(db.asc(Collection.title))
-
-	if "package" in request.args:
-		package = Package.get_by_key(request.args["package"])
-		if package is None:
-			abort(404)
-
-		query = query.filter(Collection.packages.contains(package))
-
-	collections = [x for x in query.all() if x.check_perm(current_user, Permission.VIEW_COLLECTION)]
-	return render_template("collections/list.html",
-		user=user, collections=collections,
-		noindex=len(collections) == 0)
-
-
-@bp.route("/collections/<author>/<name>/")
-def view(author, name):
-	collection = Collection.query \
-		.filter(Collection.name == name, Collection.author.has(username=author)) \
-		.one_or_404()
-
-	if not collection.check_perm(current_user, Permission.VIEW_COLLECTION):
-		abort(404)
-
-	items = collection.items
-	if collection.check_perm(current_user, Permission.EDIT_COLLECTION):
-		items = [x for x in items if x.package.check_perm(current_user, Permission.VIEW_PACKAGE)]
-
-	return render_template("collections/view.html", collection=collection, items=items)
-
-
-class CollectionForm(FlaskForm):
-	title = StringField(lazy_gettext("Title"), [InputRequired(), Length(3, 100)])
-	name = StringField("URL", [Optional(), Length(1, 20), Regexp("^[a-z0-9_]", 0,
-		"Lower case letters (a-z), digits (0-9), and underscores (_) only")])
-	short_description = StringField(lazy_gettext("Short Description"), [Optional(), Length(0, 200)])
-	long_description = TextAreaField(lazy_gettext("Page Content"), [Optional()], filters=[nonempty_or_none])
-	private = BooleanField(lazy_gettext("Private"))
-	descriptions = FieldList(
-		StringField(lazy_gettext("Short Description"), [Optional(), Length(0, 500)], filters=[nonempty_or_none]),
-		min_entries=0)
-	package_ids = FieldList(HiddenField(), min_entries=0)
-	package_removed = FieldList(HiddenField(), min_entries=0)
-	order = HiddenField()
-	submit = SubmitField(lazy_gettext("Save"))
-
-
-@bp.route("/collections/new/", methods=["GET", "POST"])
-@bp.route("/collections/<author>/<name>/edit/", methods=["GET", "POST"])
-@login_required
-def create_edit(author=None, name=None):
-	collection: typing.Optional[Collection] = None
-	if author is not None and name is not None:
-		collection = Collection.query \
-			.filter(Collection.name == name, Collection.author.has(username=author)) \
-			.one_or_404()
-		if not collection.check_perm(current_user, Permission.EDIT_COLLECTION):
-			abort(403)
-	elif "author" in request.args:
-		author = request.args["author"]
-		if author != current_user.username and not current_user.rank.at_least(UserRank.EDITOR):
-			abort(403)
-
-	if author is None:
-		author = current_user
-	else:
-		author = User.query.filter_by(username=author).one()
-
-	form = CollectionForm(formdata=request.form, obj=collection)
-
-	initial_packages = []
-	if "package" in request.args:
-		for package_id in request.args.getlist("package"):
-			package = Package.get_by_key(package_id)
-			if package:
-				initial_packages.append(package)
-
-	if request.method == "GET":
-		# HACK: fix bug in wtforms
-		form.private.data = collection.private if collection else False
-		if collection:
-			for item in collection.items:
-				form.descriptions.append_entry(item.description)
-				form.package_ids.append_entry(item.package.get_id())
-				form.package_removed.append_entry("0")
-		else:
-			form.name = None
-
-	if form.validate_on_submit():
-		ret = handle_create_edit(collection, form, initial_packages, author)
-		if ret:
-			return ret
-
-	return render_template("collections/create_edit.html",
-			collection=collection, form=form)
-
-
-def handle_create_edit(collection: Collection, form: CollectionForm,
-		initial_packages: typing.List[Package], author: User):
-
-	severity = AuditSeverity.NORMAL if author == current_user else AuditSeverity.EDITOR
-	name = form.name.data if collection else regex_invalid_chars.sub("", form.title.data.lower().replace(" ", "_"))
-
-	if collection is None or name != collection.name:
-		if Collection.query \
-				.filter(Collection.name == name, Collection.author == author) \
-				.count() > 0:
-			flash(gettext("A collection with a similar title already exists"), "danger")
-			return
-
-		if Package.query \
-				.filter(Package.name == name, Package.author == author) \
-				.count() > 0:
-			flash(gettext("Unable to create collection as a package with that name already exists"), "danger")
-			return
-
-	if collection is None:
-		collection = Collection()
-		collection.author = author
-		form.populate_obj(collection)
-		collection.name = name
-		db.session.add(collection)
-
-		for package in initial_packages:
-			link = CollectionPackage()
-			link.package = package
-			link.collection = collection
-			link.order = len(collection.items)
-			db.session.add(link)
-
-		add_audit_log(severity, current_user,
-				f"Created collection {collection.author.username}/{collection.name}",
-				collection.get_url("collections.view"), None)
-
-	else:
-		form.populate_obj(collection)
-		collection.name = name
-
-		link_lookup = {}
-		for link in collection.items:
-			link_lookup[link.package.get_id()] = link
-
-		for i, package_id in enumerate(form.package_ids):
-			link = link_lookup.get(package_id.data)
-			to_delete = form.package_removed[i].data == "1"
-			if link is None:
-				if to_delete:
-					continue
-
-				package = Package.get_by_key(package_id.data)
-				if package is None:
-					abort(400)
-
-				link = CollectionPackage()
-				link.package = package
-				link.collection = collection
-				link.description = form.descriptions[i].data
-				link_lookup[link.package.get_id()] = link
-				db.session.add(link)
-			elif to_delete:
-				db.session.delete(link)
-			else:
-				link.description = form.descriptions[i].data
-
-		for i, package_id in enumerate(form.order.data.split(",")):
-			if package_id != "":
-				link_lookup[package_id].order = i + 1
-
-		add_audit_log(severity, current_user,
-				f"Edited collection {collection.author.username}/{collection.name}",
-				collection.get_url("collections.view"), None)
-
-	db.session.commit()
-	return redirect(collection.get_url("collections.view"))
-
-
-@bp.route("/collections/<author>/<name>/delete/", methods=["GET", "POST"])
-@login_required
-def delete(author, name):
-	collection = Collection.query \
-		.filter(Collection.name == name, Collection.author.has(username=author)) \
-		.one_or_404()
-	if not collection.check_perm(current_user, Permission.EDIT_COLLECTION):
-		abort(403)
-
-	if request.method == "POST":
-		add_audit_log(AuditSeverity.NORMAL, current_user,
-				f"Deleted collection {collection.author.username}/{collection.name}",
-				collection.get_url("collections.view"), None)
-
-		db.session.delete(collection)
-		db.session.commit()
-		return redirect(url_for("collections.list_all", author=author))
-
-	return render_template("collections/delete.html", collection=collection)
-
-
-def toggle_package(collection: Collection, package: Package):
-	severity = AuditSeverity.NORMAL if collection.author == current_user else AuditSeverity.EDITOR
-
-	author = User.query.get(collection.author_id) if collection.author is None else collection.author
-
-	if package in collection.packages:
-		CollectionPackage.query \
-			.filter(CollectionPackage.collection == collection, CollectionPackage.package == package) \
-			.delete(synchronize_session=False)
-		add_audit_log(severity, current_user,
-				f"Removed {package.get_id()} from collection {author.username}/{collection.name}",
-				collection.get_url("collections.view"), None)
-		db.session.commit()
-		return False
-	else:
-		link = CollectionPackage()
-		link.package = package
-		link.collection = collection
-		link.order = len(collection.items)
-		db.session.add(link)
-		add_audit_log(severity, current_user,
-				f"Added {package.get_id()} to collection {author.username}/{collection.name}",
-				collection.get_url("collections.view"), None)
-		db.session.commit()
-		return True
-
-
-def get_or_create_favorites(session):
-	collection = Collection.query.filter(Collection.name == "favorites", Collection.author == current_user).first()
-	if collection is None:
-		is_new = True
-		collection = Collection()
-		collection.title = "Favorites"
-		collection.name = "favorites"
-		collection.short_description = "My favorites"
-		collection.author_id = current_user.id
-		session.add(collection)
-	else:
-		is_new = False
-
-	return collection, is_new
-
-
-@bp.route("/packages/<author>/<name>/add-to/", methods=["GET", "POST"])
-@is_package_page
-@login_required
-def package_add(package):
-	with create_session() as new_session:
-		collection, is_new = get_or_create_favorites(new_session)
-		if is_new:
-			new_session.commit()
-
-	if request.method == "POST":
-		collection_id = request.form["collection"]
-		collection = Collection.query.get(collection_id)
-		if collection is None:
-			abort(404)
-
-		if not collection.check_perm(current_user, Permission.EDIT_COLLECTION):
-			abort(403)
-
-		if toggle_package(collection, package):
-			flash(gettext("Added package to collection"), "success")
-		else:
-			flash(gettext("Removed package from collection"), "success")
-
-		return redirect(package.get_url("collections.package_add"))
-
-	collections = current_user.collections.all()
-	if current_user.rank.at_least(UserRank.EDITOR) and current_user.username != "ContentDB":
-		collections.extend(Collection.query.filter(Collection.author.has(username="ContentDB")).all())
-
-	return render_template("collections/package_add_to.html", package=package, collections=collections)
-
-
-@bp.route("/packages/<author>/<name>/favorite/", methods=["POST"])
-@is_package_page
-@login_required
-def package_toggle_favorite(package):
-	collection, _is_new = get_or_create_favorites(db.session)
-
-	if toggle_package(collection, package):
-		msg = gettext("Added package to favorites collection")
-		if not collection.private:
-			msg += " " + gettext("(Public, change from Profile > My Collections)")
-
-		flash(msg, "success")
-	else:
-		flash(gettext("Removed package from favorites collection"), "success")
-
-	return redirect(package.get_url("packages.view"))
-
-
-@bp.route("/collections/<author>/<name>/clone/", methods=["POST"])
-@login_required
-def clone(author, name):
-	old_collection: typing.Optional[Collection] = Collection.query \
-		.filter(Collection.name == name, Collection.author.has(username=author)) \
-		.one_or_404()
-
-	index = 0
-	new_name = name
-	new_title = old_collection.title
-	while True:
-		if Collection.query \
-				.filter(Collection.name == new_name, Collection.author == current_user) \
-				.count() == 0:
-			break
-
-		index += 1
-		new_name = f"{name}_{index}"
-		new_title = f"{old_collection.title} ({index})"
-
-	collection = Collection()
-	collection.title = new_title
-	collection.author = current_user
-	collection.short_description = old_collection.short_description
-	collection.name = new_name
-	collection.private = True
-	db.session.add(collection)
-
-	for item in old_collection.items:
-		new_item = CollectionPackage()
-		new_item.package = item.package
-		new_item.collection = collection
-		new_item.description = item.description
-		new_item.order = item.order
-		db.session.add(new_item)
-
-	add_audit_log(AuditSeverity.NORMAL, current_user,
-			f"Created collection {collection.name} from {old_collection.author.username}/{old_collection.name} ",
-			collection.get_url("collections.view"), None)
-
-	db.session.commit()
-
-	return redirect(collection.get_url("collections.view"))

app/blueprints/donate/__init__.py

@@ -1,49 +0,0 @@
-# ContentDB
-# Copyright (C) 2023 rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-
-from flask import Blueprint, render_template
-from flask_login import current_user
-from sqlalchemy import or_, and_
-
-from app.models import User, Package, PackageState, db, License, PackageReview, Collection
-
-bp = Blueprint("donate", __name__)
-
-
-@bp.route("/donate/")
-def donate():
-	reviewed_packages = None
-	if current_user.is_authenticated:
-		reviewed_packages = Package.query.filter(
-			Package.state == PackageState.APPROVED,
-			or_(Package.reviews.any(and_(PackageReview.author_id == current_user.id, PackageReview.rating >= 3)),
-				Package.collections.any(and_(Collection.author_id == current_user.id, Collection.name == "favorites"))),
-			or_(Package.donate_url.isnot(None), Package.author.has(User.donate_url.isnot(None)))
-		).order_by(db.asc(Package.title)).all()
-
-	query = Package.query.filter(
-			Package.license.has(License.is_foss == True),
-			Package.media_license.has(License.is_foss == True),
-			Package.state == PackageState.APPROVED,
-			or_(Package.donate_url.isnot(None), Package.author.has(User.donate_url.isnot(None)))
-	).order_by(db.desc(Package.score))
-
-	packages_count = query.count()
-	top_packages = query.limit(40).all()
-
-	return render_template("donate/index.html",
-			reviewed_packages=reviewed_packages, top_packages=top_packages, packages_count=packages_count)

app/blueprints/github/__init__.py

@@ -14,8 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from flask import Blueprint, abort
-from flask_babel import gettext
+from flask import Blueprint
 
 bp = Blueprint("github", __name__)
 
@@ -23,20 +22,14 @@ from flask import redirect, url_for, request, flash, jsonify, current_app
 from flask_login import current_user
 from sqlalchemy import func, or_, and_
 from app import github, csrf
-from app.models import db, User, APIToken, Package, Permission, AuditSeverity, PackageState
-from app.utils import abs_url_for, add_audit_log, login_user_set_active, is_safe_url
+from app.models import db, User, APIToken, Package, Permission, AuditSeverity
+from app.utils import abs_url_for, addAuditLog, login_user_set_active
 from app.blueprints.api.support import error, api_create_vcs_release
 import hmac, requests
 
-
 @bp.route("/github/start/")
 def start():
-	next = request.args.get("next")
-	if next and not is_safe_url(next):
-		abort(400)
-
-	return github.authorize("", redirect_uri=abs_url_for("github.callback", next=next))
-
+	return github.authorize("", redirect_uri=abs_url_for("github.callback"))
 
 @bp.route("/github/view/")
 def view_permissions():
@@ -44,28 +37,20 @@ def view_permissions():
 			current_app.config["GITHUB_CLIENT_ID"]
 	return redirect(url)
 
-
 @bp.route("/github/callback/")
 @github.authorized_handler
 def callback(oauth_token):
+	next_url = request.args.get("next")
 	if oauth_token is None:
-		flash(gettext("Authorization failed [err=gh-oauth-login-failed]"), "danger")
+		flash("Authorization failed [err=gh-oauth-login-failed]", "danger")
 		return redirect(url_for("users.login"))
 
-	next = request.args.get("next")
-	if next and not is_safe_url(next):
-		abort(400)
-
-	redirect_to = next
-	if redirect_to is None:
-		redirect_to = url_for("homepage.home")
-
-	# Get GitGub username
+	# Get Github username
 	url = "https://api.github.com/user"
 	r = requests.get(url, headers={"Authorization": "token " + oauth_token})
 	username = r.json()["login"]
 
-	# Get user by GitHub username
+	# Get user by github username
 	userByGithub = User.query.filter(func.lower(User.github_username) == func.lower(username)).first()
 
 	# If logged in, connect
@@ -73,28 +58,30 @@ def callback(oauth_token):
 		if userByGithub is None:
 			current_user.github_username = username
 			db.session.commit()
-			flash(gettext("Linked GitHub to account"), "success")
-			return redirect(redirect_to)
+			flash("Linked github to account", "success")
+			return redirect(url_for("homepage.home"))
 		else:
-			flash(gettext("GitHub account is already associated with another user"), "danger")
-			return redirect(redirect_to)
+			flash("Github account is already associated with another user", "danger")
+			return redirect(url_for("homepage.home"))
 
 	# If not logged in, log in
 	else:
 		if userByGithub is None:
-			flash(gettext("Unable to find an account for that GitHub user"), "danger")
+			flash("Unable to find an account for that Github user", "danger")
 			return redirect(url_for("users.claim_forums"))
+		elif login_user_set_active(userByGithub, remember=True):
+			addAuditLog(AuditSeverity.USER, userByGithub, "Logged in using GitHub OAuth",
+					url_for("users.profile", username=userByGithub.username))
+			db.session.commit()
 
-		ret = login_user_set_active(userByGithub, next, remember=True)
-		if ret is None:
-			flash(gettext("Authorization failed [err=gh-login-failed]"), "danger")
+			if not current_user.password:
+				return redirect(next_url or url_for("users.set_password", optional=True))
+			else:
+				return redirect(next_url or url_for("homepage.home"))
+		else:
+			flash("Authorization failed [err=gh-login-failed]", "danger")
 			return redirect(url_for("users.login"))
 
-		add_audit_log(AuditSeverity.USER, userByGithub, "Logged in using GitHub OAuth",
-				url_for("users.profile", username=userByGithub.username))
-		db.session.commit()
-		return ret
-
 
 @bp.route("/github/webhook/", methods=["POST"])
 @csrf.exempt
@@ -103,8 +90,7 @@ def webhook():
 
 	# Get package
 	github_url = "github.com/" + json["repository"]["full_name"]
-	package = Package.query.filter(
-		Package.repo.ilike("%{}%".format(github_url)), Package.state != PackageState.DELETED).first()
+	package = Package.query.filter(Package.repo.ilike("%{}%".format(github_url))).first()
 	if package is None:
 		return error(400, "Could not find package, did you set the VCS repo in CDB correctly? Expected {}".format(github_url))
 
@@ -137,7 +123,7 @@ def webhook():
 	if actual_token is None:
 		return error(403, "Invalid authentication, couldn't validate API token")
 
-	if not package.check_perm(actual_token.owner, Permission.APPROVE_RELEASE):
+	if not package.checkPerm(actual_token.owner, Permission.APPROVE_RELEASE):
 		return error(403, "You do not have the permission to approve releases")
 
 	#
@@ -148,27 +134,13 @@ def webhook():
 	if event == "push":
 		ref = json["after"]
 		title = json["head_commit"]["message"].partition("\n")[0]
-		branch = json["ref"].replace("refs/heads/", "")
-		if branch not in [ "master", "main" ]:
-			return jsonify({ "success": False, "message": "Webhook ignored, as it's not on the master/main branch" })
-
-	elif event == "create":
-		ref_type = json.get("ref_type")
-		if ref_type != "tag":
-			return jsonify({
-					"success": False,
-					"message": "Webhook ignored, as it's a non-tag create event. ref_type='{}'.".format(ref_type)
-			})
-
+	elif event == "create" and json["ref_type"] == "tag":
 		ref = json["ref"]
 		title = ref
-
 	elif event == "ping":
 		return jsonify({ "success": True, "message": "Ping successful" })
-
 	else:
-		return error(400, "Unsupported event: '{}'. Only 'push', 'create:tag', and 'ping' are supported."
-				.format(event or "null"))
+		return error(400, "Unsupported event. Only 'push', `create:tag`, and 'ping' are supported.")
 
 	#
 	# Perform release

app/blueprints/gitlab/__init__.py

@@ -14,12 +14,12 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from flask import Blueprint, request, jsonify
+from flask import Blueprint, request
 
 bp = Blueprint("gitlab", __name__)
 
 from app import csrf
-from app.models import Package, APIToken, Permission, PackageState
+from app.models import Package, APIToken, Permission
 from app.blueprints.api.support import error, api_create_vcs_release
 
 
@@ -28,8 +28,7 @@ def webhook_impl():
 
 	# Get package
 	gitlab_url = json["project"]["web_url"].replace("https://", "").replace("http://", "")
-	package = Package.query.filter(
-		Package.repo.ilike("%{}%".format(gitlab_url)), Package.state != PackageState.DELETED).first()
+	package = Package.query.filter(Package.repo.ilike("%{}%".format(gitlab_url))).first()
 	if package is None:
 		return error(400,
 				"Could not find package, did you set the VCS repo in CDB correctly? Expected {}".format(gitlab_url))
@@ -43,7 +42,7 @@ def webhook_impl():
 	if token is None:
 		return error(403, "Invalid authentication")
 
-	if not package.check_perm(token.owner, Permission.APPROVE_RELEASE):
+	if not package.checkPerm(token.owner, Permission.APPROVE_RELEASE):
 		return error(403, "You do not have the permission to approve releases")
 
 	#
@@ -54,18 +53,11 @@ def webhook_impl():
 	if event == "push":
 		ref = json["after"]
 		title = ref[:5]
-
-		branch = json["ref"].replace("refs/heads/", "")
-		if branch not in ["master", "main"]:
-			return jsonify({"success": False,
-				"message": "Webhook ignored, as it's not on the master/main branch"})
-
 	elif event == "tag_push":
 		ref = json["ref"]
 		title = ref.replace("refs/tags/", "")
 	else:
-		return error(400, "Unsupported event: '{}'. Only 'push', 'create:tag', and 'ping' are supported."
-				.format(event or "null"))
+		return error(400, "Unsupported event. Only 'push' and 'tag_push' are supported.")
 
 	#
 	# Perform release

app/blueprints/homepage/__init__.py

@@ -1,86 +1,43 @@
-# ContentDB
-# Copyright (C) 2018-23 rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-from flask import Blueprint, render_template, redirect
-from sqlalchemy import and_
-
-from app.models import Package, PackageReview, Thread, User, PackageState, db, PackageType, PackageRelease, Tags, Tag, \
-	Collection
+from flask import Blueprint, render_template
 
 bp = Blueprint("homepage", __name__)
 
-from sqlalchemy.orm import joinedload, subqueryload
+from app.models import *
+import flask_menu as menu
+from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import func
 
-
-PKGS_PER_ROW = 4
-
-
-@bp.route("/gamejam/")
-def gamejam():
-	return redirect("https://forum.minetest.net/viewtopic.php?t=28802")
-
-
 @bp.route("/")
+@menu.register_menu(bp, ".", "Home")
 def home():
-	def package_load(query):
+	def join(query):
 		return query.options(
-				joinedload(Package.author),
-				subqueryload(Package.main_screenshot),
-				subqueryload(Package.cover_image),
 				joinedload(Package.license),
 				joinedload(Package.media_license))
 
-	def review_load(query):
-		return query.options(
-			joinedload(PackageReview.author),
-			joinedload(PackageReview.thread).subqueryload(Thread.first_reply),
-			joinedload(PackageReview.package).joinedload(Package.author).load_only(User.username, User.display_name),
-			joinedload(PackageReview.package).load_only(Package.title, Package.name).subqueryload(Package.main_screenshot))
+	query   = Package.query.filter_by(state=PackageState.APPROVED)
+	count   = query.count()
 
-	query = Package.query.filter_by(state=PackageState.APPROVED)
-	count = query.count()
+	new     = join(query.order_by(db.desc(Package.approved_at))).limit(4).all()
+	pop_mod = join(query.filter_by(type=PackageType.MOD).order_by(db.desc(Package.score))).limit(8).all()
+	pop_gam = join(query.filter_by(type=PackageType.GAME).order_by(db.desc(Package.score))).limit(8).all()
+	pop_txp = join(query.filter_by(type=PackageType.TXP).order_by(db.desc(Package.score))).limit(8).all()
+	high_reviewed = join(query.order_by(db.desc(Package.score - Package.score_downloads))) \
+			.filter(Package.reviews.any()).limit(4).all()
 
-	spotlight_pkgs = query.filter(
-			Package.collections.any(and_(Collection.name == "spotlight", Collection.author.has(username="ContentDB")))) \
-		.order_by(func.random()).limit(6).all()
+	updated = db.session.query(Package).select_from(PackageRelease).join(Package) \
+			.filter_by(state=PackageState.APPROVED) \
+			.order_by(db.desc(PackageRelease.releaseDate)) \
+			.limit(20).all()
+	updated = updated[:4]
 
-	new = package_load(query.order_by(db.desc(Package.approved_at))).limit(PKGS_PER_ROW).all()
-	pop_mod = package_load(query.filter_by(type=PackageType.MOD).order_by(db.desc(Package.score))).limit(2*PKGS_PER_ROW).all()
-	pop_gam = package_load(query.filter_by(type=PackageType.GAME).order_by(db.desc(Package.score))).limit(2*PKGS_PER_ROW).all()
-	pop_txp = package_load(query.filter_by(type=PackageType.TXP).order_by(db.desc(Package.score))).limit(2*PKGS_PER_ROW).all()
-	high_reviewed = package_load(query.order_by(db.desc(Package.score - Package.score_downloads))) \
-			.filter(Package.reviews.any()).limit(PKGS_PER_ROW).all()
-
-	updated = package_load(db.session.query(Package).select_from(PackageRelease).join(Package)
-			.filter_by(state=PackageState.APPROVED)
-			.order_by(db.desc(PackageRelease.releaseDate))
-			.limit(20)).all()
-	updated = updated[:PKGS_PER_ROW]
-
-	reviews = review_load(PackageReview.query.filter(PackageReview.rating > 3)
-			.order_by(db.desc(PackageReview.created_at))).limit(5).all()
+	reviews = PackageReview.query.filter_by(recommends=True).order_by(db.desc(PackageReview.created_at)).limit(5).all()
 
 	downloads_result = db.session.query(func.sum(Package.downloads)).one_or_none()
 	downloads = 0 if not downloads_result or not downloads_result[0] else downloads_result[0]
 
 	tags = db.session.query(func.count(Tags.c.tag_id), Tag) \
-		.select_from(Tag).outerjoin(Tags).join(Package).filter(Package.state == PackageState.APPROVED)\
-		.group_by(Tag.id).order_by(db.asc(Tag.title)).all()
+		.select_from(Tag).outerjoin(Tags).group_by(Tag.id).order_by(db.asc(Tag.title)).all()
 
-	return render_template("index.html", count=count, downloads=downloads, tags=tags, spotlight_pkgs=spotlight_pkgs,
-			new=new, updated=updated, pop_mod=pop_mod, pop_txp=pop_txp, pop_gam=pop_gam, high_reviewed=high_reviewed,
-			reviews=reviews)
+	return render_template("index.html", count=count, downloads=downloads, tags=tags,
+			new=new, updated=updated, pop_mod=pop_mod, pop_txp=pop_txp, pop_gam=pop_gam, high_reviewed=high_reviewed, reviews=reviews)

app/blueprints/metapackages/__init__.py

@@ -14,31 +14,27 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from flask import Blueprint, redirect, render_template, abort
+
+from flask import *
 from sqlalchemy import func
 from app.models import MetaPackage, Package, db, Dependency, PackageState, ForumTopic
 
-bp = Blueprint("modnames", __name__)
+bp = Blueprint("metapackages", __name__)
 
 
-@bp.route("/metapackages/<path:path>")
-def mp_redirect(path):
-	return redirect("/modnames/" + path)
-
-
-@bp.route("/modnames/")
+@bp.route("/metapackages/")
 def list_all():
-	modnames = db.session.query(MetaPackage, func.count(Package.id)) \
+	mpackages = db.session.query(MetaPackage, func.count(Package.id)) \
 			.select_from(MetaPackage).outerjoin(MetaPackage.packages) \
 			.order_by(db.asc(MetaPackage.name)) \
 			.group_by(MetaPackage.id).all()
-	return render_template("modnames/list.html", modnames=modnames)
+	return render_template("metapackages/list.html", mpackages=mpackages)
 
 
-@bp.route("/modnames/<name>/")
+@bp.route("/metapackages/<name>/")
 def view(name):
-	modname = MetaPackage.query.filter_by(name=name).first()
-	if modname is None:
+	mpackage = MetaPackage.query.filter_by(name=name).first()
+	if mpackage is None:
 		abort(404)
 
 	dependers = db.session.query(Package) \
@@ -57,12 +53,13 @@ def view(name):
 		.filter(Dependency.optional==True, Package.state==PackageState.APPROVED) \
 		.all()
 
-	similar_topics = ForumTopic.query \
-		.filter_by(name=name) \
-		.filter(~ db.exists().where(Package.forums == ForumTopic.topic_id)) \
-		.order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \
-		.all()
+	similar_topics = None
+	if mpackage.packages.filter_by(state=PackageState.APPROVED).count() == 0:
+		similar_topics = ForumTopic.query \
+				.filter_by(name=name) \
+				.order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \
+				.all()
 
-	return render_template("modnames/view.html", modname=modname,
+	return render_template("metapackages/view.html", mpackage=mpackage,
 			dependers=dependers, optional_dependers=optional_dependers,
 			similar_topics=similar_topics)

app/blueprints/metrics/__init__.py

@@ -17,12 +17,10 @@
 from flask import Blueprint, make_response
 from sqlalchemy.sql.expression import func
 
-from app.models import Package, db, User, UserRank, PackageState, PackageReview, ThreadReply, Collection
-from app.rediscache import get_key
+from app.models import Package, db, User, UserRank, PackageState
 
 bp = Blueprint("metrics", __name__)
 
-
 def generate_metrics(full=False):
 	def write_single_stat(name, help, type, value):
 		fmt = "# HELP {name} {help}\n# TYPE {name} {type}\n{name} {value}\n\n"
@@ -33,6 +31,7 @@ def generate_metrics(full=False):
 		pieces = [key + "=" + str(val) for key, val in labels.items()]
 		return ",".join(pieces)
 
+
 	def write_array_stat(name, help, type, data):
 		ret = "# HELP {name} {help}\n# TYPE {name} {type}\n" \
 			.format(name=name, help=help, type=type)
@@ -49,18 +48,11 @@ def generate_metrics(full=False):
 
 	packages = Package.query.filter_by(state=PackageState.APPROVED).count()
 	users = User.query.filter(User.rank != UserRank.NOT_JOINED).count()
-	reviews = PackageReview.query.count()
-	comments = ThreadReply.query.count()
-	collections = Collection.query.count()
 
 	ret = ""
-	ret += write_single_stat("contentdb_packages", "Total packages", "gauge", packages)
-	ret += write_single_stat("contentdb_users", "Number of registered users", "gauge", users)
-	ret += write_single_stat("contentdb_downloads", "Total downloads", "gauge", downloads)
-	ret += write_single_stat("contentdb_emails", "Number of emails sent", "counter", int(get_key("emails_sent", "0")))
-	ret += write_single_stat("contentdb_reviews", "Number of reviews", "gauge", reviews)
-	ret += write_single_stat("contentdb_comments", "Number of comments", "gauge", comments)
-	ret += write_single_stat("contentdb_collections", "Number of collections", "gauge", collections)
+	ret += write_single_stat("contentdb_packages", "Total packages", "counter", packages)
+	ret += write_single_stat("contentdb_users", "Number of registered users", "counter", users)
+	ret += write_single_stat("contentdb_downloads", "Total downloads", "counter", downloads)
 
 	if full:
 		scores = Package.query.join(User).with_entities(User.username, Package.name, Package.score) \
@@ -75,7 +67,6 @@ def generate_metrics(full=False):
 
 	return ret
 
-
 @bp.route("/metrics")
 def metrics():
 	response = make_response(generate_metrics(), 200)

app/blueprints/notifications/__init__.py

@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+
 from flask import Blueprint, render_template, redirect, url_for
 from flask_login import current_user, login_required
 from sqlalchemy import or_, desc

app/blueprints/oauth/__init__.py

@@ -1,295 +0,0 @@
-# ContentDB
-# Copyright (C) 2023 rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import urllib.parse as urlparse
-from typing import Optional
-from urllib.parse import urlencode
-
-from flask import Blueprint, render_template, redirect, url_for, request, jsonify, abort, make_response, flash
-from flask_babel import lazy_gettext, gettext
-from flask_login import current_user, login_required
-from flask_wtf import FlaskForm
-from wtforms import StringField, SubmitField, URLField
-from wtforms.validators import InputRequired, Length
-
-from app import csrf
-from app.blueprints.users.settings import get_setting_tabs
-from app.models import db, OAuthClient, User, Permission, APIToken, AuditSeverity, UserRank
-from app.utils import random_string, add_audit_log
-
-bp = Blueprint("oauth", __name__)
-
-
-def build_redirect_url(url: str, code: str, state: Optional[str]):
-	params = {"code": code}
-	if state is not None:
-		params["state"] = state
-	url_parts = list(urlparse.urlparse(url))
-	query = dict(urlparse.parse_qsl(url_parts[4]))
-	query.update(params)
-	url_parts[4] = urlencode(query)
-	return urlparse.urlunparse(url_parts)
-
-
-@bp.route("/oauth/authorize/", methods=["GET", "POST"])
-@login_required
-def oauth_start():
-	response_type = request.args.get("response_type", "code")
-	if response_type != "code":
-		return "Unsupported response_type, only code is supported", 400
-
-	client_id = request.args.get("client_id")
-	if client_id is None:
-		return "Missing client_id", 400
-
-	redirect_uri = request.args.get("redirect_uri")
-	if redirect_uri is None:
-		return "Missing redirect_uri", 400
-
-	client = OAuthClient.query.get_or_404(client_id)
-	if client.redirect_url != redirect_uri:
-		return "redirect_uri does not match client", 400
-
-	if not client.approved and client.owner != current_user:
-		abort(404)
-
-	valid_scopes = {"user:email", "package", "package:release", "package:screenshot"}
-	scope = request.args.get("scope", "")
-	scopes = [x.strip() for x in scope.split(",")]
-	scopes = set([x for x in scopes if x != ""])
-	unknown_scopes = scopes - valid_scopes
-	if unknown_scopes:
-		return f"Unknown scopes: {', '.join(unknown_scopes)}", 400
-
-	state = request.args.get("state")
-
-	token = APIToken.query.filter(APIToken.client == client, APIToken.owner == current_user).first()
-	if token and not (scopes - token.get_scopes()):
-		token.access_token = random_string(32)
-		token.auth_code = random_string(32)
-		db.session.commit()
-		return redirect(build_redirect_url(client.redirect_url, token.auth_code, state))
-
-	if request.method == "POST":
-		action = request.form["action"]
-		if action == "cancel":
-			return redirect(client.redirect_url)
-
-		elif action == "authorize":
-			if token is None:
-				token = APIToken()
-				token.name = f"Token for {client.title} by {client.owner.username}"
-				token.owner = current_user
-				token.client = client
-
-			token.access_token = random_string(32)
-			assert client is not None
-			token.auth_code = random_string(32)
-			db.session.add(token)
-
-			token.set_scopes(scopes)
-
-			add_audit_log(AuditSeverity.USER, current_user,
-					f"Granted \"{scope}\" to OAuth2 application \"{client.title}\" by {client.owner.username} [{client_id}] ",
-					url_for("users.profile", username=current_user.username))
-
-			db.session.commit()
-
-			return redirect(build_redirect_url(client.redirect_url, token.auth_code, state))
-
-	scopes_info = []
-	if not scopes:
-		scopes_info.append({
-			"icon": "globe-europe",
-			"title": "Public data only",
-			"description": "Read-only access to your public data",
-		})
-
-	if "user:email" in scopes:
-		scopes_info.append({
-			"icon": "user",
-			"title": gettext("Personal data"),
-			"description": gettext("Email address (read-only)"),
-		})
-
-	if ("package" in scopes or
-			"package:release" in scopes or
-			"package:screenshot" in scopes):
-		if "package" in scopes:
-			msg = gettext("Ability to edit packages and their releases, screenshots, and related data")
-		elif "package:release" in scopes and "package:screenshot" in scopes:
-			msg = gettext("Ability to create and edit releases and screenshots")
-		elif "package:release" in scopes:
-			msg = gettext("Ability to create and edit releases")
-		elif "package:screenshot" in scopes:
-			msg = gettext("Ability to create and edit screenshots")
-		else:
-			assert False, "This should never happen"
-
-		scopes_info.append({
-			"icon": "pen",
-			"title": gettext("Packages"),
-			"description": msg,
-		})
-
-	return render_template("oauth/authorize.html", client=client, scopes=scopes_info)
-
-
-def error(code: int, msg: str):
-	abort(make_response(jsonify({"success": False, "error": msg}), code))
-
-
-@bp.route("/oauth/token/", methods=["POST"])
-@csrf.exempt
-def oauth_grant():
-	form = request.form
-
-	grant_type = request.args.get("grant_type", "authorization_code")
-	if grant_type != "authorization_code":
-		error(400, "Unsupported grant_type, only authorization_code is supported")
-
-	client_id = form.get("client_id")
-	if client_id is None:
-		error(400, "Missing client_id")
-
-	client_secret = form.get("client_secret")
-	if client_secret is None:
-		error(400, "Missing client_secret")
-
-	code = form.get("code")
-	if code is None:
-		error(400, "Missing code")
-
-	client = OAuthClient.query.filter_by(id=client_id, secret=client_secret).first()
-	if client is None:
-		error(400, "client_id and/or client_secret is incorrect")
-
-	token = APIToken.query.filter_by(auth_code=code).first()
-	if token is None or token.client != client:
-		error(400, "Incorrect code. It may have already been redeemed")
-
-	token.auth_code = None
-	db.session.commit()
-
-	return jsonify({
-		"access_token": token.access_token,
-		"token_type": "Bearer",
-	})
-
-
-@bp.route("/user/apps/")
-@login_required
-def list_clients_redirect():
-	return redirect(url_for("oauth.list_clients", username=current_user.username))
-
-
-@bp.route("/users/<username>/apps/")
-@login_required
-def list_clients(username):
-	user = User.query.filter_by(username=username).first_or_404()
-	if not user.check_perm(current_user, Permission.CREATE_OAUTH_CLIENT):
-		abort(403)
-
-	return render_template("oauth/list_clients.html", user=user, tabs=get_setting_tabs(user), current_tab="oauth_clients")
-
-
-class OAuthClientForm(FlaskForm):
-	title = StringField(lazy_gettext("Title"), [InputRequired(), Length(5, 30)])
-	redirect_url = URLField(lazy_gettext("Redirect URL"), [InputRequired(), Length(5, 123)])
-	submit = SubmitField(lazy_gettext("Save"))
-
-
-@bp.route("/users/<username>/apps/new/", methods=["GET", "POST"])
-@bp.route("/users/<username>/apps/<id_>/edit/", methods=["GET", "POST"])
-@login_required
-def create_edit_client(username, id_=None):
-	user = User.query.filter_by(username=username).first_or_404()
-	if not user.check_perm(current_user, Permission.CREATE_OAUTH_CLIENT):
-		abort(403)
-
-	is_new = id_ is None
-	client = None
-	if id_ is not None:
-		client = OAuthClient.query.get_or_404(id_)
-		if client.owner != user:
-			abort(404)
-
-	form = OAuthClientForm(formdata=request.form, obj=client)
-	if form.validate_on_submit():
-		if is_new:
-			client = OAuthClient()
-			db.session.add(client)
-			client.owner = user
-			client.id = random_string(24)
-			client.secret = random_string(32)
-			client.approved = current_user.rank.at_least(UserRank.EDITOR)
-
-		form.populate_obj(client)
-
-		verb = "Created" if is_new else "Edited"
-		add_audit_log(AuditSeverity.NORMAL, current_user,
-				f"{verb} OAuth2 application {client.title} by {client.owner.username} [{client.id}]",
-				url_for("oauth.create_edit_client", username=client.owner.username, id_=client.id))
-
-		db.session.commit()
-
-		return redirect(url_for("oauth.create_edit_client", username=username, id_=client.id))
-
-	return render_template("oauth/create_edit.html", user=user, form=form, client=client)
-
-
-@bp.route("/users/<username>/apps/<id_>/delete/", methods=["POST"])
-@login_required
-def delete_client(username, id_):
-	user = User.query.filter_by(username=username).first_or_404()
-	if not user.check_perm(current_user, Permission.CREATE_OAUTH_CLIENT):
-		abort(403)
-
-	client = OAuthClient.query.get(id_)
-	if client is None or client.owner != user:
-		abort(404)
-
-	add_audit_log(AuditSeverity.NORMAL, current_user,
-			f"Deleted OAuth2 application {client.title} by {client.owner.username} [{client.id}]",
-			url_for("users.profile", username=current_user.username))
-
-	db.session.delete(client)
-	db.session.commit()
-
-	return redirect(url_for("oauth.list_clients", username=username))
-
-
-@bp.route("/users/<username>/apps/<id_>/revoke-all/", methods=["POST"])
-@login_required
-def revoke_all(username, id_):
-	user = User.query.filter_by(username=username).first_or_404()
-	if not user.check_perm(current_user, Permission.CREATE_OAUTH_CLIENT):
-		abort(403)
-
-	client = OAuthClient.query.get(id_)
-	if client is None or client.owner != user:
-		abort(404)
-
-	add_audit_log(AuditSeverity.NORMAL, current_user,
-			f"Revoked all user tokens for OAuth2 application {client.title} by {client.owner.username} [{client.id}]",
-			url_for("oauth.create_edit_client", username=client.owner.username, id_=client.id))
-
-	client.tokens = []
-	db.session.commit()
-
-	flash(gettext("Revoked all user tokens"), "success")
-
-	return redirect(url_for("oauth.create_edit_client", username=client.owner.username, id_=client.id))

app/blueprints/packages/__init__.py

@@ -15,68 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 from flask import Blueprint
-from flask_babel import gettext
-
-from app.models import User, Package, Permission, PackageType
 
 bp = Blueprint("packages", __name__)
 
-
-def get_package_tabs(user: User, package: Package):
-	if package is None or not package.check_perm(user, Permission.EDIT_PACKAGE):
-		return []
-
-	retval = [
-		{
-			"id": "edit",
-			"title": gettext("Edit Details"),
-			"url": package.get_url("packages.create_edit")
-		},
-		{
-			"id": "releases",
-			"title": gettext("Releases"),
-			"url": package.get_url("packages.list_releases")
-		},
-		{
-			"id": "screenshots",
-			"title": gettext("Screenshots"),
-			"url": package.get_url("packages.screenshots")
-		},
-		{
-			"id": "maintainers",
-			"title": gettext("Maintainers"),
-			"url": package.get_url("packages.edit_maintainers")
-		},
-		{
-			"id": "audit",
-			"title": gettext("Audit Log"),
-			"url": package.get_url("packages.audit")
-		},
-		{
-			"id": "stats",
-			"title": gettext("Statistics"),
-			"url": package.get_url("packages.statistics")
-		},
-		{
-			"id": "share",
-			"title": gettext("Share and Badges"),
-			"url": package.get_url("packages.share")
-		},
-		{
-			"id": "remove",
-			"title": gettext("Remove / Unpublish"),
-			"url": package.get_url("packages.remove")
-		}
-	]
-
-	if package.type == PackageType.MOD or package.type == PackageType.TXP:
-		retval.insert(1, {
-			"id": "game_support",
-			"title": gettext("Supported Games"),
-			"url": package.get_url("packages.game_support")
-		})
-
-	return retval
-
-
-from . import packages, screenshots, releases, reviews, game_hub
+from . import packages, screenshots, releases, reviews

app/blueprints/packages/game_hub.py

@@ -1,53 +0,0 @@
-# ContentDB
-# Copyright (C) 2022 rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-from flask import render_template, abort
-from sqlalchemy.orm import joinedload
-
-from . import bp
-from app.utils import is_package_page
-from app.models import Package, PackageType, PackageState, db, PackageRelease
-
-
-@bp.route("/packages/<author>/<name>/hub/")
-@is_package_page
-def game_hub(package: Package):
-	if package.type != PackageType.GAME:
-		abort(404)
-
-	def join(query):
-		return query.options(
-			joinedload(Package.license),
-			joinedload(Package.media_license))
-
-	query = Package.query.filter(Package.supported_games.any(game=package, supports=True), Package.state==PackageState.APPROVED)
-	count = query.count()
-
-	new = join(query.order_by(db.desc(Package.approved_at))).limit(4).all()
-	pop_mod = join(query.filter_by(type=PackageType.MOD).order_by(db.desc(Package.score))).limit(8).all()
-	pop_txp = join(query.filter_by(type=PackageType.TXP).order_by(db.desc(Package.score))).limit(8).all()
-	high_reviewed = join(query.order_by(db.desc(Package.score - Package.score_downloads))) \
-		.filter(Package.reviews.any()).limit(4).all()
-
-	updated = db.session.query(Package).select_from(PackageRelease).join(Package) \
-		.filter(Package.supported_games.any(game=package, supports=True), Package.state==PackageState.APPROVED) \
-		.order_by(db.desc(PackageRelease.releaseDate)) \
-		.limit(20).all()
-	updated = updated[:4]
-
-	return render_template("packages/game_hub.html", package=package, count=count,
-			new=new, updated=updated, pop_mod=pop_mod, pop_txp=pop_txp,
-			high_reviewed=high_reviewed)

app/blueprints/packages/packages.py

@@ -14,43 +14,37 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import datetime
-import typing
+
 from urllib.parse import quote as urlescape
 
+import flask_menu as menu
 from celery import uuid
-from flask import render_template, make_response, request, redirect, flash, url_for, abort
-from flask_babel import gettext, lazy_gettext
-from flask_login import login_required, current_user
+from flask import render_template, flash
 from flask_wtf import FlaskForm
-from jinja2.utils import markupsafe
-from sqlalchemy import func, or_, and_
+from flask_login import login_required
+from sqlalchemy import or_, func
 from sqlalchemy.orm import joinedload, subqueryload
-from wtforms import SelectField, StringField, TextAreaField, IntegerField, SubmitField, BooleanField
-from wtforms.validators import InputRequired, Length, Regexp, DataRequired, Optional, URL, NumberRange, ValidationError
-from wtforms_sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField
+from wtforms import *
+from wtforms.ext.sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField
+from wtforms.validators import *
 
-from app.logic.LogicError import LogicError
-from app.logic.packages import do_edit_package
 from app.querybuilder import QueryBuilder
 from app.rediscache import has_key, set_key
-from app.tasks.importtasks import import_repo_screenshot, check_zip_release
-from app.tasks.webhooktasks import post_discord_webhook
-from app.logic.game_support import GameSupportResolver
-
-from . import bp, get_package_tabs
-from app.models import Package, Tag, db, User, Tags, PackageState, Permission, PackageType, MetaPackage, ForumTopic, \
-	Dependency, Thread, UserRank, PackageReview, PackageDevState, ContentWarning, License, AuditSeverity, \
-	PackageScreenshot, NotificationType, AuditLogEntry, PackageAlias, PackageProvides, PackageGameSupport, \
-	PackageDailyStats, Collection
-from app.utils import is_user_bot, get_int_or_abort, is_package_page, abs_url_for, add_audit_log, get_package_by_info, \
-	add_notification, get_system_user, rank_required, get_games_from_csv, get_daterange_options
+from app.tasks.importtasks import importRepoScreenshot, checkZipRelease
+from app.utils import *
+from . import bp
+from ...logic.LogicError import LogicError
+from ...logic.packages import do_edit_package
 
 
+@menu.register_menu(bp, ".mods", "Mods", order=11, endpoint_arguments_constructor=lambda: { 'type': 'mod' })
+@menu.register_menu(bp, ".games", "Games", order=12, endpoint_arguments_constructor=lambda: { 'type': 'game' })
+@menu.register_menu(bp, ".txp", "Texture Packs", order=13, endpoint_arguments_constructor=lambda: { 'type': 'txp' })
+@menu.register_menu(bp, ".random", "Random", order=14, endpoint_arguments_constructor=lambda: { 'random': '1', 'lucky': '1' })
 @bp.route("/packages/")
 def list_all():
 	qb    = QueryBuilder(request.args)
-	query = qb.build_package_query()
+	query = qb.buildPackageQuery()
 	title = qb.title
 
 	query = query.options(
@@ -76,15 +70,15 @@ def list_all():
 	if qb.lucky:
 		package = query.first()
 		if package:
-			return redirect(package.get_url("packages.view"))
+			return redirect(package.getDetailsURL())
 
-		topic = qb.build_topic_query().first()
+		topic = qb.buildTopicQuery().first()
 		if qb.search and topic:
 			return redirect("https://forum.minetest.net/viewtopic.php?t=" + str(topic.topic_id))
 
 	page  = get_int_or_abort(request.args.get("page"), 1)
 	num   = min(40, get_int_or_abort(request.args.get("n"), 100))
-	query = query.paginate(page=page, per_page=num)
+	query = query.paginate(page, num, True)
 
 	search = request.args.get("q")
 	type_name = request.args.get("type")
@@ -100,73 +94,54 @@ def list_all():
 	topics = None
 	if qb.search and not query.has_next:
 		qb.show_discarded = True
-		topics = qb.build_topic_query().all()
+		topics = qb.buildTopicQuery().all()
 
 	tags_query = db.session.query(func.count(Tags.c.tag_id), Tag) \
-		.select_from(Tag).join(Tags).join(Package).filter(Package.state==PackageState.APPROVED) \
-		.group_by(Tag.id).order_by(db.asc(Tag.title))
-	tags = qb.filter_package_query(tags_query).all()
+  		.select_from(Tag).join(Tags).join(Package).group_by(Tag.id).order_by(db.asc(Tag.title))
+	tags = qb.filterPackageQuery(tags_query).all()
 
 	selected_tags = set(qb.tags)
 
 	return render_template("packages/list.html",
-			query_hint=title, packages=query.items, pagination=query,
+			title=title, packages=query.items, pagination=query,
 			query=search, tags=tags, selected_tags=selected_tags, type=type_name,
-			authors=authors, packages_count=query.total, topics=topics, noindex=qb.noindex)
+			authors=authors, packages_count=query.total, topics=topics)
 
 
-def get_releases(package):
-	if package.check_perm(current_user, Permission.MAKE_RELEASE):
+def getReleases(package):
+	if package.checkPerm(current_user, Permission.MAKE_RELEASE):
 		return package.releases.limit(5)
 	else:
 		return package.releases.filter_by(approved=True).limit(5)
 
 
-@bp.route("/packages/<author>/")
-def user_redirect(author):
-	return redirect(url_for("users.profile", username=author))
-
-
 @bp.route("/packages/<author>/<name>/")
 @is_package_page
 def view(package):
-	if not package.check_perm(current_user, Permission.VIEW_PACKAGE):
-		return render_template("packages/gone.html", package=package), 403
+	alternatives = None
+	if package.type == PackageType.MOD:
+		alternatives = Package.query \
+			.filter_by(name=package.name, type=PackageType.MOD) \
+			.filter(Package.id != package.id, Package.state!=PackageState.DELETED) \
+			.order_by(db.desc(Package.score)) \
+			.all()
 
-	show_similar = not package.approved and (
-			current_user in package.maintainers or
-				package.check_perm(current_user, Permission.APPROVE_NEW))
 
-	conflicting_modnames = None
-	if show_similar and package.type != PackageType.TXP:
-		conflicting_modnames = db.session.query(MetaPackage.name) \
-				.filter(MetaPackage.id.in_([ mp.id for mp in package.provides ])) \
-				.filter(MetaPackage.packages.any(and_(Package.id != package.id, Package.state == PackageState.APPROVED))) \
-				.all()
+	show_similar_topics = current_user == package.author or \
+			package.checkPerm(current_user, Permission.APPROVE_NEW)
 
-		conflicting_modnames += db.session.query(ForumTopic.name) \
-				.filter(ForumTopic.name.in_([ mp.name for mp in package.provides ])) \
+	similar_topics = None if not show_similar_topics else \
+			ForumTopic.query \
+				.filter_by(name=package.name) \
 				.filter(ForumTopic.topic_id != package.forums) \
 				.filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \
 				.order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \
 				.all()
 
-		conflicting_modnames = set([x[0] for x in conflicting_modnames])
-
-	packages_uses = None
-	if package.type == PackageType.MOD:
-		packages_uses = Package.query.filter(
-				Package.type == PackageType.MOD,
-				Package.id != package.id,
-				Package.state == PackageState.APPROVED,
-				Package.dependencies.any(
-						Dependency.meta_package_id.in_([p.id for p in package.provides]))) \
-			.order_by(db.desc(Package.score)).limit(6).all()
-
-	releases = get_releases(package)
+	releases = getReleases(package)
 
 	review_thread = package.review_thread
-	if review_thread is not None and not review_thread.check_perm(current_user, Permission.SEE_THREAD):
+	if review_thread is not None and not review_thread.checkPerm(current_user, Permission.SEE_THREAD):
 		review_thread = None
 
 	topic_error = None
@@ -174,53 +149,47 @@ def view(package):
 	if package.state != PackageState.APPROVED and package.forums is not None:
 		errors = []
 		if Package.query.filter(Package.forums==package.forums, Package.state!=PackageState.DELETED).count() > 1:
-			errors.append("<b>" + gettext("Error: Another package already uses this forum topic!") + "</b>")
+			errors.append("<b>Error: Another package already uses this forum topic!</b>")
 			topic_error_lvl = "danger"
 
 		topic = ForumTopic.query.get(package.forums)
 		if topic is not None:
 			if topic.author != package.author:
-				errors.append("<b>" + gettext("Error: Forum topic author doesn't match package author.") + "</b>")
+				errors.append("<b>Error: Forum topic author doesn't match package author.</b>")
 				topic_error_lvl = "danger"
 		elif package.type != PackageType.TXP:
-			errors.append(gettext("Warning: Forum topic not found. This may happen if the topic has only just been created."))
+			errors.append("Warning: Forum topic not found. This may happen if the topic has only just been created.")
 
 		topic_error = "<br />".join(errors)
 
+
 	threads = Thread.query.filter_by(package_id=package.id, review_id=None)
 	if not current_user.is_authenticated:
 		threads = threads.filter_by(private=False)
-	elif not current_user.rank.at_least(UserRank.APPROVER) and not current_user == package.author:
+	elif not current_user.rank.atLeast(UserRank.EDITOR) and not current_user == package.author:
 		threads = threads.filter(or_(Thread.private == False, Thread.author == current_user))
 
-	has_review = current_user.is_authenticated and \
-		PackageReview.query.filter_by(package=package, author=current_user).count() > 0
-
-	is_favorited = current_user.is_authenticated and \
-		Collection.query.filter(
-			Collection.author == current_user,
-			Collection.packages.contains(package),
-			Collection.name == "favorites").count() > 0
+	has_review = current_user.is_authenticated and PackageReview.query.filter_by(package=package, author=current_user).count() > 0
 
 	return render_template("packages/view.html",
-			package=package, releases=releases, packages_uses=packages_uses,
-			conflicting_modnames=conflicting_modnames,
+			package=package, releases=releases,
+			alternatives=alternatives, similar_topics=similar_topics,
 			review_thread=review_thread, topic_error=topic_error, topic_error_lvl=topic_error_lvl,
-			threads=threads.all(), has_review=has_review, is_favorited=is_favorited)
+			threads=threads.all(), has_review=has_review)
 
 
 @bp.route("/packages/<author>/<name>/shields/<type>/")
 @is_package_page
 def shield(package, type):
 	if type == "title":
-		url = "https://img.shields.io/static/v1?label=ContentDB&message={}&color={}" \
+		url = "https://img.shields.io/badge/ContentDB-{}-{}" \
 			.format(urlescape(package.title), urlescape("#375a7f"))
 	elif type == "downloads":
-		api_url = abs_url_for("api.package_view", author=package.author.username, name=package.name)
+		#api_url = abs_url_for("api.package", author=package.author.username, name=package.name)
+		api_url = "https://content.minetest.net" + url_for("api.package", author=package.author.username, name=package.name)
 		url = "https://img.shields.io/badge/dynamic/json?color={}&label=ContentDB&query=downloads&suffix=+downloads&url={}" \
 			.format(urlescape("#375a7f"), urlescape(api_url))
 	else:
-		from flask import abort
 		abort(404)
 
 	return redirect(url)
@@ -229,17 +198,17 @@ def shield(package, type):
 @bp.route("/packages/<author>/<name>/download/")
 @is_package_page
 def download(package):
-	release = package.get_download_release()
+	release = package.getDownloadRelease()
 
 	if release is None:
 		if "application/zip" in request.accept_mimetypes and \
-				"text/html" not in request.accept_mimetypes:
+				not "text/html" in request.accept_mimetypes:
 			return "", 204
 		else:
-			flash(gettext("No download available."), "danger")
-			return redirect(package.get_url("packages.view"))
+			flash("No download available.", "danger")
+			return redirect(package.getDetailsURL())
 	else:
-		return redirect(release.get_download_url())
+		return redirect(release.getDownloadURL(), code=302)
 
 
 def makeLabel(obj):
@@ -248,99 +217,25 @@ def makeLabel(obj):
 	else:
 		return obj.title
 
-
 class PackageForm(FlaskForm):
-	type             = SelectField(lazy_gettext("Type"), [InputRequired()], choices=PackageType.choices(), coerce=PackageType.coerce, default=PackageType.MOD)
-	title            = StringField(lazy_gettext("Title (Human-readable)"), [InputRequired(), Length(1, 100)])
-	name             = StringField(lazy_gettext("Name (Technical)"), [InputRequired(), Length(1, 100), Regexp("^[a-z0-9_]+$", 0, lazy_gettext("Lower case letters (a-z), digits (0-9), and underscores (_) only"))])
-	short_desc       = StringField(lazy_gettext("Short Description (Plaintext)"), [InputRequired(), Length(1,200)])
+	type             = SelectField("Type", [InputRequired()], choices=PackageType.choices(), coerce=PackageType.coerce, default=PackageType.MOD)
+	title            = StringField("Title (Human-readable)", [InputRequired(), Length(3, 100)])
+	name             = StringField("Name (Technical)", [InputRequired(), Length(1, 100), Regexp("^[a-z0-9_]+$", 0, "Lower case letters (a-z), digits (0-9), and underscores (_) only")])
+	short_desc       = StringField("Short Description (Plaintext)", [InputRequired(), Length(1,200)])
 
-	dev_state        = SelectField(lazy_gettext("Maintenance State"), [InputRequired()], choices=PackageDevState.choices(with_none=True), coerce=PackageDevState.coerce)
+	tags             = QuerySelectMultipleField('Tags', query_factory=lambda: Tag.query.order_by(db.asc(Tag.name)), get_pk=lambda a: a.id, get_label=makeLabel)
+	content_warnings = QuerySelectMultipleField('Content Warnings', query_factory=lambda: ContentWarning.query.order_by(db.asc(ContentWarning.name)), get_pk=lambda a: a.id, get_label=makeLabel)
+	license          = QuerySelectField("License", [DataRequired()], allow_blank=True, query_factory=lambda: License.query.order_by(db.asc(License.name)), get_pk=lambda a: a.id, get_label=lambda a: a.name)
+	media_license    = QuerySelectField("Media License", [DataRequired()], allow_blank=True, query_factory=lambda: License.query.order_by(db.asc(License.name)), get_pk=lambda a: a.id, get_label=lambda a: a.name)
 
-	tags             = QuerySelectMultipleField(lazy_gettext('Tags'), query_factory=lambda: Tag.query.order_by(db.asc(Tag.name)), get_pk=lambda a: a.id, get_label=makeLabel)
-	content_warnings = QuerySelectMultipleField(lazy_gettext('Content Warnings'), query_factory=lambda: ContentWarning.query.order_by(db.asc(ContentWarning.name)), get_pk=lambda a: a.id, get_label=makeLabel)
-	license          = QuerySelectField(lazy_gettext("License"), [DataRequired()], allow_blank=True, query_factory=lambda: License.query.order_by(db.asc(License.name)), get_pk=lambda a: a.id, get_label=lambda a: a.name)
-	media_license    = QuerySelectField(lazy_gettext("Media License"), [DataRequired()], allow_blank=True, query_factory=lambda: License.query.order_by(db.asc(License.name)), get_pk=lambda a: a.id, get_label=lambda a: a.name)
+	desc             = TextAreaField("Long Description (Markdown)", [Optional(), Length(0,10000)])
 
-	desc             = TextAreaField(lazy_gettext("Long Description (Markdown)"), [Optional(), Length(0,10000)])
+	repo             = StringField("VCS Repository URL", [Optional(), URL()], filters = [lambda x: x or None])
+	website          = StringField("Website URL", [Optional(), URL()], filters = [lambda x: x or None])
+	issueTracker     = StringField("Issue Tracker URL", [Optional(), URL()], filters = [lambda x: x or None])
+	forums           = IntegerField("Forum Topic ID", [Optional(), NumberRange(0,999999)])
 
-	repo             = StringField(lazy_gettext("VCS Repository URL"), [Optional(), URL()], filters = [lambda x: x or None])
-	website          = StringField(lazy_gettext("Website URL"), [Optional(), URL()], filters = [lambda x: x or None])
-	issueTracker     = StringField(lazy_gettext("Issue Tracker URL"), [Optional(), URL()], filters = [lambda x: x or None])
-	forums           = IntegerField(lazy_gettext("Forum Topic ID"), [Optional(), NumberRange(0, 999999)])
-	video_url        = StringField(lazy_gettext("Video URL"), [Optional(), URL()], filters=[lambda x: x or None])
-	donate_url       = StringField(lazy_gettext("Donate URL"), [Optional(), URL()], filters=[lambda x: x or None])
-
-	submit           = SubmitField(lazy_gettext("Save"))
-
-	def validate_name(self, field):
-		if field.data == "_game":
-			raise ValidationError(lazy_gettext("_game is not an allowed name"))
-
-
-def handle_create_edit(package: typing.Optional[Package], form: PackageForm, author: User):
-	wasNew = False
-	if package is None:
-		package = Package.query.filter_by(name=form.name.data, author_id=author.id).first()
-		if package is not None:
-			if package.state == PackageState.DELETED:
-				flash(
-					gettext("Package already exists, but is removed. Please contact ContentDB staff to restore the package"),
-					"danger")
-			else:
-				flash(markupsafe.Markup(
-					f"<a class='btn btn-sm btn-danger float-end' href='{package.get_url('packages.view')}'>View</a>" +
-					gettext("Package already exists")), "danger")
-			return None
-
-		if Collection.query \
-				.filter(Collection.name == form.name.data, Collection.author == author) \
-				.count() > 0:
-			flash(gettext("A collection with a similar name already exists"), "danger")
-			return
-
-		package = Package()
-		db.session.add(package)
-		package.author = author
-		package.maintainers.append(author)
-		wasNew = True
-
-	try:
-		do_edit_package(current_user, package, wasNew, True, {
-			"type": form.type.data,
-			"title": form.title.data,
-			"name": form.name.data,
-			"short_desc": form.short_desc.data,
-			"dev_state": form.dev_state.data,
-			"tags": form.tags.raw_data,
-			"content_warnings": form.content_warnings.raw_data,
-			"license": form.license.data,
-			"media_license": form.media_license.data,
-			"desc": form.desc.data,
-			"repo": form.repo.data,
-			"website": form.website.data,
-			"issueTracker": form.issueTracker.data,
-			"forums": form.forums.data,
-			"video_url": form.video_url.data,
-			"donate_url": form.donate_url.data,
-		})
-
-		if wasNew:
-			msg = f"Created package {author.username}/{form.name.data}"
-			add_audit_log(AuditSeverity.NORMAL, current_user, msg, package.get_url("packages.view"), package)
-
-		if wasNew and package.repo is not None:
-			import_repo_screenshot.delay(package.id)
-
-		next_url = package.get_url("packages.view")
-		if wasNew and ("WTFPL" in package.license.name or "WTFPL" in package.media_license.name):
-			next_url = url_for("flatpage", path="help/wtfpl", r=next_url)
-		elif wasNew:
-			next_url = package.get_url("packages.setup_releases")
-
-		return redirect(next_url)
-	except LogicError as e:
-		flash(e.message, "danger")
+	submit           = SubmitField("Save")
 
 
 @bp.route("/packages/new/", methods=["GET", "POST"])
@@ -356,19 +251,19 @@ def create_edit(author=None, name=None):
 		else:
 			author = User.query.filter_by(username=author).first()
 			if author is None:
-				flash(gettext("Unable to find that user"), "danger")
+				flash("Unable to find that user", "danger")
 				return redirect(url_for("packages.create_edit"))
 
-			if not author.check_perm(current_user, Permission.CHANGE_AUTHOR):
-				flash(gettext("Permission denied"), "danger")
+			if not author.checkPerm(current_user, Permission.CHANGE_AUTHOR):
+				flash("Permission denied", "danger")
 				return redirect(url_for("packages.create_edit"))
 
 	else:
-		package = get_package_by_info(author, name)
+		package = getPackageByInfo(author, name)
 		if package is None:
 			abort(404)
-		if not package.check_perm(current_user, Permission.EDIT_PACKAGE):
-			return redirect(package.get_url("packages.view"))
+		if not package.checkPerm(current_user, Permission.EDIT_PACKAGE):
+			return redirect(package.getDetailsURL())
 
 		author = package.author
 
@@ -377,23 +272,66 @@ def create_edit(author=None, name=None):
 	# Initial form class from post data and default data
 	if request.method == "GET":
 		if package is None:
-			form.name.data = request.args.get("bname")
-			form.title.data = request.args.get("title")
-			form.repo.data = request.args.get("repo")
+			form.name.data   = request.args.get("bname")
+			form.title.data  = request.args.get("title")
+			form.repo.data   = request.args.get("repo")
 			form.forums.data = request.args.get("forums")
 			form.license.data = None
 			form.media_license.data = None
 		else:
-			form.tags.data = package.tags
-			form.content_warnings.data = package.content_warnings
+			# form.harddep_str.data  = ",".join([str(x) for x in package.getSortedHardDependencies() ])
+			# form.softdep_str.data  = ",".join([str(x) for x in package.getSortedOptionalDependencies() ])
+			form.tags.data         = list(package.tags)
+			form.content_warnings.data = list(package.content_warnings)
 
 	if request.method == "POST" and form.type.data == PackageType.TXP:
 		form.license.data = form.media_license.data
 
 	if form.validate_on_submit():
-		ret = handle_create_edit(package, form, author)
-		if ret:
-			return ret
+		wasNew = False
+		if not package:
+			package = Package.query.filter_by(name=form["name"].data, author_id=author.id).first()
+			if package is not None:
+				if package.state == PackageState.READY_FOR_REVIEW:
+					Package.query.filter_by(name=form["name"].data, author_id=author.id).delete()
+				else:
+					flash("Package already exists!", "danger")
+					return redirect(url_for("packages.create_edit"))
+
+			package = Package()
+			package.author = author
+			package.maintainers.append(author)
+			wasNew = True
+
+		try:
+			do_edit_package(current_user, package, wasNew, {
+				"type": form.type.data,
+				"title": form.title.data,
+				"name": form.name.data,
+				"short_desc": form.short_desc.data,
+				"tags": form.tags.raw_data,
+				"content_warnings": form.content_warnings.raw_data,
+				"license": form.license.data,
+				"media_license": form.media_license.data,
+				"desc": form.desc.data,
+				"repo": form.repo.data,
+				"website": form.website.data,
+				"issueTracker": form.issueTracker.data,
+				"forums": form.forums.data,
+			})
+
+			if wasNew and package.repo is not None:
+				importRepoScreenshot.delay(package.id)
+
+			next_url = package.getDetailsURL()
+			if wasNew and ("WTFPL" in package.license.name or "WTFPL" in package.media_license.name):
+				next_url = url_for("flatpage", path="help/wtfpl", r=next_url)
+			elif wasNew:
+				next_url = package.getSetupReleasesURL()
+
+			return redirect(next_url)
+		except LogicError as e:
+			flash(e.message, "danger")
 
 	package_query = Package.query.filter_by(state=PackageState.APPROVED)
 	if package is not None:
@@ -403,8 +341,7 @@ def create_edit(author=None, name=None):
 	return render_template("packages/create_edit.html", package=package,
 			form=form, author=author, enable_wizard=enableWizard,
 			packages=package_query.all(),
-			modnames=MetaPackage.query.order_by(db.asc(MetaPackage.name)).all(),
-			tabs=get_package_tabs(current_user, package), current_tab="edit")
+			mpackages=MetaPackage.query.order_by(db.asc(MetaPackage.name)).all())
 
 
 @bp.route("/packages/<author>/<name>/state/", methods=["POST"])
@@ -415,18 +352,15 @@ def move_to_state(package):
 	if state is None:
 		abort(400)
 
-	if not package.can_move_to_state(current_user, state):
-		flash(gettext("You don't have permission to do that"), "danger")
-		return redirect(package.get_url("packages.view"))
+	if not package.canMoveToState(current_user, state):
+		flash("You don't have permission to do that", "danger")
+		return redirect(package.getDetailsURL())
 
 	package.state = state
 	msg = "Marked {} as {}".format(package.title, state.value)
 
 	if state == PackageState.APPROVED:
 		if not package.approved_at:
-			post_discord_webhook.delay(package.author.display_name,
-					"New package {}".format(package.get_url("packages.view", absolute=True)), False,
-					package.title, package.short_desc, package.get_thumb_url(2, True))
 			package.approved_at = datetime.datetime.now()
 
 		screenshots = PackageScreenshot.query.filter_by(package=package, approved=False).all()
@@ -434,25 +368,21 @@ def move_to_state(package):
 			s.approved = True
 
 		msg = "Approved {}".format(package.title)
-	elif state == PackageState.READY_FOR_REVIEW:
-		post_discord_webhook.delay(package.author.display_name,
-				"Ready for Review: {}".format(package.get_url("packages.view", absolute=True)), True,
-				package.title, package.short_desc, package.get_thumb_url(2, True))
 
-	add_notification(package.maintainers, current_user, NotificationType.PACKAGE_APPROVAL, msg, package.get_url("packages.view"), package)
+	addNotification(package.maintainers, current_user, NotificationType.PACKAGE_APPROVAL, msg, package.getDetailsURL(), package)
 	severity = AuditSeverity.NORMAL if current_user in package.maintainers else AuditSeverity.EDITOR
-	add_audit_log(severity, current_user, msg, package.get_url("packages.view"), package)
+	addAuditLog(severity, current_user, msg, package.getDetailsURL(), package)
 
 	db.session.commit()
 
 	if package.state == PackageState.CHANGES_NEEDED:
-		flash(gettext("Please comment what changes are needed in the approval thread"), "warning")
+		flash("Please comment what changes are needed in the review thread", "warning")
 		if package.review_thread:
-			return redirect(package.review_thread.get_view_url())
+			return redirect(package.review_thread.getViewURL())
 		else:
 			return redirect(url_for('threads.new', pid=package.id, title='Package approval comments'))
 
-	return redirect(package.get_url("packages.view"))
+	return redirect(package.getDetailsURL())
 
 
 @bp.route("/packages/<author>/<name>/remove/", methods=["GET", "POST"])
@@ -460,68 +390,57 @@ def move_to_state(package):
 @is_package_page
 def remove(package):
 	if request.method == "GET":
-		return render_template("packages/remove.html", package=package,
-				tabs=get_package_tabs(current_user, package), current_tab="remove")
-
-	reason = request.form.get("reason") or "?"
+		return render_template("packages/remove.html", package=package)
 
 	if "delete" in request.form:
-		if not package.check_perm(current_user, Permission.DELETE_PACKAGE):
-			flash(gettext("You don't have permission to do that"), "danger")
-			return redirect(package.get_url("packages.view"))
+		if not package.checkPerm(current_user, Permission.DELETE_PACKAGE):
+			flash("You don't have permission to do that.", "danger")
+			return redirect(package.getDetailsURL())
 
 		package.state = PackageState.DELETED
 
 		url = url_for("users.profile", username=package.author.username)
-		msg = "Deleted {}, reason={}".format(package.title, reason)
-		add_notification(package.maintainers, current_user, NotificationType.PACKAGE_EDIT, msg, url, package)
-		add_audit_log(AuditSeverity.EDITOR, current_user, msg, url, package)
+		msg = "Deleted {}".format(package.title)
+		addNotification(package.maintainers, current_user, NotificationType.PACKAGE_EDIT, msg, url, package)
+		addAuditLog(AuditSeverity.EDITOR, current_user, msg, url)
 		db.session.commit()
 
-		post_discord_webhook.delay(current_user.username,
-			f"Deleted package {package.author.username}/{package.name} with reason '{reason}'",
-			True, package.title, package.short_desc, package.get_thumb_url(2, True))
-
-		flash(gettext("Deleted package"), "success")
+		flash("Deleted package", "success")
 
 		return redirect(url)
 	elif "unapprove" in request.form:
-		if not package.check_perm(current_user, Permission.UNAPPROVE_PACKAGE):
-			flash(gettext("You don't have permission to do that"), "danger")
-			return redirect(package.get_url("packages.view"))
+		if not package.checkPerm(current_user, Permission.UNAPPROVE_PACKAGE):
+			flash("You don't have permission to do that.", "danger")
+			return redirect(package.getDetailsURL())
 
 		package.state = PackageState.WIP
 
-		msg = "Unapproved {}, reason={}".format(package.title, reason)
-		add_notification(package.maintainers, current_user, NotificationType.PACKAGE_APPROVAL, msg, package.get_url("packages.view"), package)
-		add_audit_log(AuditSeverity.EDITOR, current_user, msg, package.get_url("packages.view"), package)
+		msg = "Unapproved {}".format(package.title)
+		addNotification(package.maintainers, current_user, NotificationType.PACKAGE_APPROVAL, msg, package.getDetailsURL(), package)
+		addAuditLog(AuditSeverity.EDITOR, current_user, msg, package.getDetailsURL(), package)
 
 		db.session.commit()
 
-		post_discord_webhook.delay(current_user.username,
-			"Unapproved package with reason {}\n\n{}".format(reason, package.get_url("packages.view", absolute=True)), True,
-			package.title, package.short_desc, package.get_thumb_url(2, True))
+		flash("Unapproved package", "success")
 
-		flash(gettext("Unapproved package"), "success")
-
-		return redirect(package.get_url("packages.view"))
+		return redirect(package.getDetailsURL())
 	else:
 		abort(400)
 
 
 
 class PackageMaintainersForm(FlaskForm):
-	maintainers_str  = StringField(lazy_gettext("Maintainers (Comma-separated)"), [Optional()])
-	submit	      = SubmitField(lazy_gettext("Save"))
+	maintainers_str  = StringField("Maintainers (Comma-separated)", [Optional()])
+	submit	      = SubmitField("Save")
 
 
 @bp.route("/packages/<author>/<name>/edit-maintainers/", methods=["GET", "POST"])
 @login_required
 @is_package_page
 def edit_maintainers(package):
-	if not package.check_perm(current_user, Permission.EDIT_MAINTAINERS):
-		flash(gettext("You don't have permission to edit maintainers"), "danger")
-		return redirect(package.get_url("packages.view"))
+	if not package.checkPerm(current_user, Permission.EDIT_MAINTAINERS):
+		flash("You do not have permission to edit maintainers", "danger")
+		return redirect(package.getDetailsURL())
 
 	form = PackageMaintainersForm(formdata=request.form)
 	if request.method == "GET":
@@ -531,19 +450,15 @@ def edit_maintainers(package):
 		usernames = [x.strip().lower() for x in form.maintainers_str.data.split(",")]
 		users = User.query.filter(func.lower(User.username).in_(usernames)).all()
 
-		thread = package.threads.filter_by(author=get_system_user()).first()
-
 		for user in users:
 			if not user in package.maintainers:
-				if thread:
-					thread.watchers.append(user)
-				add_notification(user, current_user, NotificationType.MAINTAINER,
-						"Added you as a maintainer of {}".format(package.title), package.get_url("packages.view"), package)
+				addNotification(user, current_user, NotificationType.MAINTAINER,
+						"Added you as a maintainer of {}".format(package.title), package.getDetailsURL(), package)
 
 		for user in package.maintainers:
 			if user != package.author and not user in users:
-				add_notification(user, current_user, NotificationType.MAINTAINER,
-						"Removed you as a maintainer of {}".format(package.title), package.get_url("packages.view"), package)
+				addNotification(user, current_user, NotificationType.MAINTAINER,
+						"Removed you as a maintainer of {}".format(package.title), package.getDetailsURL(), package)
 
 		package.maintainers.clear()
 		package.maintainers.extend(users)
@@ -551,18 +466,18 @@ def edit_maintainers(package):
 			package.maintainers.append(package.author)
 
 		msg = "Edited {} maintainers".format(package.title)
-		add_notification(package.author, current_user, NotificationType.MAINTAINER, msg, package.get_url("packages.view"), package)
+		addNotification(package.author, current_user, NotificationType.MAINTAINER, msg, package.getDetailsURL(), package)
 		severity = AuditSeverity.NORMAL if current_user == package.author else AuditSeverity.MODERATION
-		add_audit_log(severity, current_user, msg, package.get_url("packages.view"), package)
+		addAuditLog(severity, current_user, msg, package.getDetailsURL(), package)
 
 		db.session.commit()
 
-		return redirect(package.get_url("packages.view"))
+		return redirect(package.getDetailsURL())
 
 	users = User.query.filter(User.rank >= UserRank.NEW_MEMBER).order_by(db.asc(User.username)).all()
 
-	return render_template("packages/edit_maintainers.html", package=package, form=form,
-			users=users, tabs=get_package_tabs(current_user, package), current_tab="maintainers")
+	return render_template("packages/edit_maintainers.html",
+			package=package, form=form, users=users)
 
 
 @bp.route("/packages/<author>/<name>/remove-self-maintainer/", methods=["POST"])
@@ -570,253 +485,45 @@ def edit_maintainers(package):
 @is_package_page
 def remove_self_maintainers(package):
 	if not current_user in package.maintainers:
-		flash(gettext("You are not a maintainer"), "danger")
+		flash("You are not a maintainer", "danger")
 
 	elif current_user == package.author:
-		flash(gettext("Package owners cannot remove themselves as maintainers"), "danger")
+		flash("Package owners cannot remove themselves as maintainers", "danger")
 
 	else:
 		package.maintainers.remove(current_user)
 
-		add_notification(package.author, current_user, NotificationType.MAINTAINER,
-				"Removed themself as a maintainer of {}".format(package.title), package.get_url("packages.view"), package)
+		addNotification(package.author, current_user, NotificationType.MAINTAINER,
+				"Removed themself as a maintainer of {}".format(package.title), package.getDetailsURL(), package)
 
 		db.session.commit()
 
-	return redirect(package.get_url("packages.view"))
+	return redirect(package.getDetailsURL())
 
 
-@bp.route("/packages/<author>/<name>/audit/")
+@bp.route("/packages/<author>/<name>/import-meta/", methods=["POST"])
 @login_required
 @is_package_page
-def audit(package):
-	if not (package.check_perm(current_user, Permission.EDIT_PACKAGE) or
-			package.check_perm(current_user, Permission.APPROVE_NEW)):
-		abort(403)
+def update_from_release(package):
+	if not package.checkPerm(current_user, Permission.REIMPORT_META):
+		flash("You don't have permission to reimport meta", "danger")
+		return redirect(package.getDetailsURL())
 
-	page = get_int_or_abort(request.args.get("page"), 1)
-	num = min(40, get_int_or_abort(request.args.get("n"), 100))
+	release = package.releases.first()
+	if not release:
+		flash("Release needed", "danger")
+		return redirect(package.getDetailsURL())
 
-	query = package.audit_log_entries.order_by(db.desc(AuditLogEntry.created_at))
+	msg = "Updated meta from latest release"
+	addNotification(package.maintainers, current_user, NotificationType.PACKAGE_EDIT,
+			msg, package.getDetailsURL(), package)
+	severity = AuditSeverity.NORMAL if current_user in package.maintainers else AuditSeverity.EDITOR
+	addAuditLog(severity, current_user, msg, package.getDetailsURL(), package)
 
-	pagination = query.paginate(page=page, per_page=num)
-	return render_template("packages/audit.html", log=pagination.items, pagination=pagination,
-		package=package, tabs=get_package_tabs(current_user, package), current_tab="audit")
+	db.session.commit()
 
+	task_id = uuid()
+	zippath = release.url.replace("/uploads/", app.config["UPLOAD_DIR"])
+	checkZipRelease.apply_async((release.id, zippath), task_id=task_id)
 
-class PackageAliasForm(FlaskForm):
-	author  = StringField(lazy_gettext("Author Name"), [InputRequired(), Length(1, 50)])
-	name    = StringField(lazy_gettext("Name (Technical)"), [InputRequired(), Length(1, 100),
-			Regexp("^[a-z0-9_]+$", 0, lazy_gettext("Lower case letters (a-z), digits (0-9), and underscores (_) only"))])
-	submit  = SubmitField(lazy_gettext("Save"))
-
-
-@bp.route("/packages/<author>/<name>/aliases/")
-@rank_required(UserRank.ADMIN)
-@is_package_page
-def alias_list(package: Package):
-	return render_template("packages/alias_list.html", package=package)
-
-
-@bp.route("/packages/<author>/<name>/aliases/new/", methods=["GET", "POST"])
-@bp.route("/packages/<author>/<name>/aliases/<int:alias_id>/", methods=["GET", "POST"])
-@rank_required(UserRank.ADMIN)
-@is_package_page
-def alias_create_edit(package: Package, alias_id: int = None):
-	alias = None
-	if alias_id:
-		alias = PackageAlias.query.get(alias_id)
-		if alias is None or alias.package != package:
-			abort(404)
-
-	form = PackageAliasForm(request.form, obj=alias)
-	if form.validate_on_submit():
-		if alias is None:
-			alias = PackageAlias()
-			alias.package = package
-			db.session.add(alias)
-
-		form.populate_obj(alias)
-		db.session.commit()
-
-		return redirect(package.get_url("packages.alias_list"))
-
-	return render_template("packages/alias_create_edit.html", package=package, form=form)
-
-
-@bp.route("/packages/<author>/<name>/share/")
-@login_required
-@is_package_page
-def share(package):
-	return render_template("packages/share.html", package=package,
-			tabs=get_package_tabs(current_user, package), current_tab="share")
-
-
-@bp.route("/packages/<author>/<name>/similar/")
-@is_package_page
-def similar(package):
-	packages_modnames = {}
-	for mname in package.provides:
-		packages_modnames[mname] = Package.query.filter(Package.id != package.id,
-				Package.state != PackageState.DELETED) \
-			.filter(Package.provides.any(PackageProvides.c.metapackage_id == mname.id)) \
-			.order_by(db.desc(Package.score)) \
-			.all()
-
-	similar_topics = ForumTopic.query \
-		.filter_by(name=package.name) \
-		.filter(ForumTopic.topic_id != package.forums) \
-		.filter(~ db.exists().where(Package.forums == ForumTopic.topic_id)) \
-		.order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \
-		.all()
-
-	return render_template("packages/similar.html", package=package,
-			packages_modnames=packages_modnames, similar_topics=similar_topics)
-
-
-class GameSupportForm(FlaskForm):
-	enable_support_detection = BooleanField(lazy_gettext("Enable support detection based on dependencies (recommended)"), [Optional()])
-	supported = StringField(lazy_gettext("Supported games"), [Optional()])
-	unsupported = StringField(lazy_gettext("Unsupported games"), [Optional()])
-	supports_all_games = BooleanField(lazy_gettext("Supports all games (unless stated) / is game independent"), [Optional()])
-	submit = SubmitField(lazy_gettext("Save"))
-
-
-@bp.route("/packages/<author>/<name>/support/", methods=["GET", "POST"])
-@login_required
-@is_package_page
-def game_support(package):
-	if package.type != PackageType.MOD and package.type != PackageType.TXP:
-		abort(404)
-
-	can_edit = package.check_perm(current_user, Permission.EDIT_PACKAGE)
-	if not (can_edit or package.check_perm(current_user, Permission.APPROVE_NEW)):
-		abort(403)
-
-	if package.releases.count() == 0:
-		flash(gettext("You need at least one release before you can edit game support"), "danger")
-		return redirect(package.get_url('packages.create_release' if package.update_config else 'packages.setup_releases'))
-
-	if package.type == PackageType.MOD and len(package.provides) == 0:
-		flash(gettext("Mod(pack) needs to contain at least one mod. Please create a new release"), "danger")
-		return redirect(package.get_url('packages.list_releases'))
-
-	force_game_detection = package.supported_games.filter(and_(
-		PackageGameSupport.confidence > 1, PackageGameSupport.supports == True)).count() == 0
-
-	can_support_all_games = package.type != PackageType.TXP and \
-		package.supported_games.filter(and_(
-			PackageGameSupport.confidence == 1, PackageGameSupport.supports == True)).count() == 0
-
-	can_override = can_edit
-
-	form = GameSupportForm() if can_edit else None
-	if form and request.method == "GET":
-		form.enable_support_detection.data = package.enable_game_support_detection
-		form.supports_all_games.data = package.supports_all_games and can_support_all_games
-
-		if can_override:
-			manual_supported_games = package.supported_games.filter_by(confidence=11).all()
-			form.supported.data = ", ".join([x.game.name for x in manual_supported_games if x.supports])
-			form.unsupported.data = ", ".join([x.game.name for x in manual_supported_games if not x.supports])
-		else:
-			form.supported = None
-			form.unsupported = None
-
-	if form and form.validate_on_submit():
-		detect_update_needed = False
-
-		if can_override:
-			try:
-				resolver = GameSupportResolver(db.session)
-
-				game_is_supported = {}
-				for game in get_games_from_csv(db.session, form.supported.data or ""):
-					game_is_supported[game.id] = True
-				for game in get_games_from_csv(db.session, form.unsupported.data or ""):
-					game_is_supported[game.id] = False
-				resolver.set_supported(package, game_is_supported, 11)
-				detect_update_needed = True
-			except LogicError as e:
-				flash(e.message, "danger")
-
-		next_url = package.get_url("packages.game_support")
-
-		enable_support_detection = form.enable_support_detection.data or force_game_detection
-		if enable_support_detection != package.enable_game_support_detection:
-			package.enable_game_support_detection = enable_support_detection
-			if package.enable_game_support_detection:
-				detect_update_needed = True
-			else:
-				package.supported_games.filter_by(confidence=1).delete()
-
-		if can_support_all_games:
-			package.supports_all_games = form.supports_all_games.data
-
-		add_audit_log(AuditSeverity.NORMAL, current_user, "Edited game support", package.get_url("packages.game_support"), package)
-
-		db.session.commit()
-
-		if detect_update_needed:
-			release = package.releases.first()
-			if release:
-				task_id = uuid()
-				check_zip_release.apply_async((release.id, release.file_path), task_id=task_id)
-				next_url = url_for("tasks.check", id=task_id, r=next_url)
-
-		return redirect(next_url)
-
-	all_game_support = package.supported_games.all()
-	all_game_support.sort(key=lambda x: -x.game.score)
-	supported_games_list: typing.List[str] = [x.game.name for x in all_game_support if x.supports]
-	if package.supports_all_games:
-		supported_games_list.insert(0, "*")
-	supported_games = ", ".join(supported_games_list)
-	unsupported_games = ", ".join([x.game.name for x in all_game_support if not x.supports])
-
-	mod_conf_lines = ""
-	if supported_games:
-		mod_conf_lines += f"supported_games = {supported_games}"
-	if unsupported_games:
-		mod_conf_lines += f"\nunsupported_games = {unsupported_games}"
-
-	return render_template("packages/game_support.html", package=package, form=form,
-			mod_conf_lines=mod_conf_lines, force_game_detection=force_game_detection,
-			can_support_all_games=can_support_all_games, tabs=get_package_tabs(current_user, package),
-			current_tab="game_support")
-
-
-@bp.route("/packages/<author>/<name>/stats/")
-@is_package_page
-def statistics(package):
-	start = request.args.get("start")
-	end = request.args.get("end")
-
-	return render_template("packages/stats.html",
-		package=package, tabs=get_package_tabs(current_user, package), current_tab="stats",
-		start=start, end=end, options=get_daterange_options(), noindex=start or end)
-
-
-@bp.route("/packages/<author>/<name>/stats.csv")
-@is_package_page
-def stats_csv(package):
-	stats: typing.List[PackageDailyStats] = package.daily_stats.order_by(db.asc(PackageDailyStats.date)).all()
-
-	columns = ["platform_minetest", "platform_other", "reason_new",
-				"reason_dependency", "reason_update"]
-
-	result = "Date, " + ", ".join(columns) + "\n"
-
-	for stat in stats:
-		stat: PackageDailyStats
-		result += stat.date.isoformat()
-		for i, key in enumerate(columns):
-			result += ", " + str(getattr(stat, key))
-		result += "\n"
-
-	date = datetime.datetime.utcnow().date()
-
-	res = make_response(result, 200)
-	res.headers["Content-Disposition"] = f"attachment; filename={package.author.username}_{package.name}_stats_{date.isoformat()}.csv"
-	res.headers["Content-type"] = "text/csv"
-	return res
+	return redirect(url_for("tasks.check", id=task_id, r=package.getEditURL()))

app/blueprints/packages/releases.py

@@ -14,29 +14,19 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from flask import render_template, request, redirect, flash, url_for, abort
-from flask_babel import lazy_gettext, gettext
-from flask_login import login_required, current_user
+
+from flask import *
+from flask_login import login_required
 from flask_wtf import FlaskForm
-from wtforms import StringField, SubmitField, BooleanField, RadioField, FileField
-from wtforms.validators import InputRequired, Length, Optional
-from wtforms_sqlalchemy.fields import QuerySelectField
+from wtforms import *
+from wtforms.ext.sqlalchemy.fields import QuerySelectField
+from wtforms.validators import *
 
 from app.logic.releases import do_create_vcs_release, LogicError, do_create_zip_release
-from app.models import Package, db, User, PackageState, Permission, UserRank, PackageDailyStats, MinetestRelease, \
-	PackageRelease, PackageUpdateTrigger, PackageUpdateConfig
 from app.rediscache import has_key, set_key, make_download_key
 from app.tasks.importtasks import check_update_config
-from app.utils import is_user_bot, is_package_page, nonempty_or_none
-from . import bp, get_package_tabs
-
-
-@bp.route("/packages/<author>/<name>/releases/", methods=["GET", "POST"])
-@is_package_page
-def list_releases(package):
-	return render_template("packages/releases_list.html",
-			package=package,
-			tabs=get_package_tabs(current_user, package), current_tab="releases")
+from app.utils import *
+from . import bp
 
 
 def get_mt_releases(is_max):
@@ -50,40 +40,38 @@ def get_mt_releases(is_max):
 
 
 class CreatePackageReleaseForm(FlaskForm):
-	title       = StringField(lazy_gettext("Title"), [InputRequired(), Length(1, 30)])
-	uploadOpt   = RadioField(lazy_gettext("Method"), choices=[("upload", lazy_gettext("File Upload"))], default="upload")
-	vcsLabel    = StringField(lazy_gettext("Git reference (ie: commit hash, branch, or tag)"), default=None)
-	file_upload = FileField(lazy_gettext("File Upload"))
-	min_rel     = QuerySelectField(lazy_gettext("Minimum Minetest Version"), [InputRequired()],
+	title	   = StringField("Title", [InputRequired(), Length(1, 30)])
+	uploadOpt  = RadioField ("Method", choices=[("upload", "File Upload")], default="upload")
+	vcsLabel   = StringField("Git reference (ie: commit hash, branch, or tag)", default=None)
+	fileUpload = FileField("File Upload")
+	min_rel    = QuerySelectField("Minimum Minetest Version", [InputRequired()],
 			query_factory=lambda: get_mt_releases(False), get_pk=lambda a: a.id, get_label=lambda a: a.name)
-	max_rel    = QuerySelectField(lazy_gettext("Maximum Minetest Version"), [InputRequired()],
+	max_rel    = QuerySelectField("Maximum Minetest Version", [InputRequired()],
 			query_factory=lambda: get_mt_releases(True), get_pk=lambda a: a.id, get_label=lambda a: a.name)
-	submit     = SubmitField(lazy_gettext("Save"))
-
+	submit	   = SubmitField("Save")
 
 class EditPackageReleaseForm(FlaskForm):
-	title    = StringField(lazy_gettext("Title"), [InputRequired(), Length(1, 30)])
-	url      = StringField(lazy_gettext("URL"), [Optional()])
-	task_id  = StringField(lazy_gettext("Task ID"), filters = [lambda x: x or None])
-	approved = BooleanField(lazy_gettext("Is Approved"))
-	min_rel  = QuerySelectField(lazy_gettext("Minimum Minetest Version"), [InputRequired()],
+	title    = StringField("Title", [InputRequired(), Length(1, 30)])
+	url      = StringField("URL", [Optional()])
+	task_id  = StringField("Task ID", filters = [lambda x: x or None])
+	approved = BooleanField("Is Approved")
+	min_rel  = QuerySelectField("Minimum Minetest Version", [InputRequired()],
 			query_factory=lambda: get_mt_releases(False), get_pk=lambda a: a.id, get_label=lambda a: a.name)
-	max_rel  = QuerySelectField(lazy_gettext("Maximum Minetest Version"), [InputRequired()],
+	max_rel  = QuerySelectField("Maximum Minetest Version", [InputRequired()],
 			query_factory=lambda: get_mt_releases(True), get_pk=lambda a: a.id, get_label=lambda a: a.name)
-	submit   = SubmitField(lazy_gettext("Save"))
-
+	submit   = SubmitField("Save")
 
 @bp.route("/packages/<author>/<name>/releases/new/", methods=["GET", "POST"])
 @login_required
 @is_package_page
 def create_release(package):
-	if not package.check_perm(current_user, Permission.MAKE_RELEASE):
-		return redirect(package.get_url("packages.view"))
+	if not package.checkPerm(current_user, Permission.MAKE_RELEASE):
+		return redirect(package.getDetailsURL())
 
 	# Initial form class from post data and default data
 	form = CreatePackageReleaseForm()
 	if package.repo is not None:
-		form["uploadOpt"].choices = [("vcs", gettext("Import from Git")), ("upload", gettext("Upload .zip file"))]
+		form["uploadOpt"].choices = [("vcs", "Import from Git"), ("upload", "Upload .zip file")]
 		if request.method == "GET":
 			form["uploadOpt"].data = "vcs"
 			form.vcsLabel.data = request.args.get("ref")
@@ -95,18 +83,18 @@ def create_release(package):
 		try:
 			if form["uploadOpt"].data == "vcs":
 				rel = do_create_vcs_release(current_user, package, form.title.data,
-						form.vcsLabel.data, form.min_rel.data.get_actual(), form.max_rel.data.get_actual())
+						form.vcsLabel.data, form.min_rel.data.getActual(), form.max_rel.data.getActual())
 			else:
 				rel = do_create_zip_release(current_user, package, form.title.data,
-						form.file_upload.data, form.min_rel.data.get_actual(), form.max_rel.data.get_actual())
-			return redirect(url_for("tasks.check", id=rel.task_id, r=rel.get_edit_url()))
+						form.fileUpload.data, form.min_rel.data.getActual(), form.max_rel.data.getActual())
+			return redirect(url_for("tasks.check", id=rel.task_id, r=rel.getEditURL()))
 		except LogicError as e:
 			flash(e.message, "danger")
 
 	return render_template("packages/release_new.html", package=package, form=form)
 
 
-@bp.route("/packages/<author>/<name>/releases/<int:id>/download/")
+@bp.route("/packages/<author>/<name>/releases/<id>/download/")
 @is_package_page
 def download_release(package, id):
 	release = PackageRelease.query.get(id)
@@ -115,19 +103,11 @@ def download_release(package, id):
 
 	ip = request.headers.get("X-Forwarded-For") or request.remote_addr
 	if ip is not None and not is_user_bot():
-		is_minetest = (request.headers.get("User-Agent") or "").startswith("Minetest")
-		reason = request.args.get("reason")
-		PackageDailyStats.update(package, is_minetest, reason)
-
 		key = make_download_key(ip, release.package)
 		if not has_key(key):
 			set_key(key, "true")
 
-			bonus = 0
-			if reason == "new":
-				bonus = 1
-			elif reason == "dependency" or reason == "update":
-				bonus = 0.5
+			bonus = 1
 
 			PackageRelease.query.filter_by(id=release.id).update({
 					"downloads": PackageRelease.downloads + 1
@@ -139,12 +119,12 @@ def download_release(package, id):
 					"score": Package.score + bonus
 				})
 
-		db.session.commit()
+			db.session.commit()
 
-	return redirect(release.url)
+	return redirect(release.url, code=300)
 
 
-@bp.route("/packages/<author>/<name>/releases/<int:id>/", methods=["GET", "POST"])
+@bp.route("/packages/<author>/<name>/releases/<id>/", methods=["GET", "POST"])
 @login_required
 @is_package_page
 def edit_release(package, id):
@@ -152,10 +132,10 @@ def edit_release(package, id):
 	if release is None or release.package != package:
 		abort(404)
 
-	canEdit	= package.check_perm(current_user, Permission.MAKE_RELEASE)
-	canApprove = release.check_perm(current_user, Permission.APPROVE_RELEASE)
+	canEdit	= package.checkPerm(current_user, Permission.MAKE_RELEASE)
+	canApprove = package.checkPerm(current_user, Permission.APPROVE_RELEASE)
 	if not (canEdit or canApprove):
-		return redirect(package.get_url("packages.view"))
+		return redirect(package.getDetailsURL())
 
 	# Initial form class from post data and default data
 	form = EditPackageReleaseForm(formdata=request.form, obj=release)
@@ -167,10 +147,10 @@ def edit_release(package, id):
 	if form.validate_on_submit():
 		if canEdit:
 			release.title = form["title"].data
-			release.min_rel = form["min_rel"].data.get_actual()
-			release.max_rel = form["max_rel"].data.get_actual()
+			release.min_rel = form["min_rel"].data.getActual()
+			release.max_rel = form["max_rel"].data.getActual()
 
-		if package.check_perm(current_user, Permission.CHANGE_RELEASE_URL):
+		if package.checkPerm(current_user, Permission.CHANGE_RELEASE_URL):
 			release.url = form["url"].data
 			release.task_id = form["task_id"].data
 			if release.task_id is not None:
@@ -182,29 +162,29 @@ def edit_release(package, id):
 			release.approved = False
 
 		db.session.commit()
-		return redirect(package.get_url("packages.list_releases"))
+		return redirect(package.getDetailsURL())
 
 	return render_template("packages/release_edit.html", package=package, release=release, form=form)
 
 
 
 class BulkReleaseForm(FlaskForm):
-	set_min = BooleanField(lazy_gettext("Set Min"))
-	min_rel  = QuerySelectField(lazy_gettext("Minimum Minetest Version"), [InputRequired()],
+	set_min = BooleanField("Set Min")
+	min_rel  = QuerySelectField("Minimum Minetest Version", [InputRequired()],
 			query_factory=lambda: get_mt_releases(False), get_pk=lambda a: a.id, get_label=lambda a: a.name)
-	set_max = BooleanField(lazy_gettext("Set Max"))
-	max_rel  = QuerySelectField(lazy_gettext("Maximum Minetest Version"), [InputRequired()],
+	set_max = BooleanField("Set Max")
+	max_rel  = QuerySelectField("Maximum Minetest Version", [InputRequired()],
 			query_factory=lambda: get_mt_releases(True), get_pk=lambda a: a.id, get_label=lambda a: a.name)
-	only_change_none = BooleanField(lazy_gettext("Only change values previously set as none"))
-	submit   = SubmitField(lazy_gettext("Update"))
+	only_change_none = BooleanField("Only change values previously set as none")
+	submit   = SubmitField("Update")
 
 
 @bp.route("/packages/<author>/<name>/releases/bulk_change/", methods=["GET", "POST"])
 @login_required
 @is_package_page
 def bulk_change_release(package):
-	if not package.check_perm(current_user, Permission.MAKE_RELEASE):
-		return redirect(package.get_url("packages.view"))
+	if not package.checkPerm(current_user, Permission.MAKE_RELEASE):
+		return redirect(package.getDetailsURL())
 
 	# Initial form class from post data and default data
 	form = BulkReleaseForm()
@@ -216,18 +196,18 @@ def bulk_change_release(package):
 
 		for release in package.releases.all():
 			if form["set_min"].data and (not only_change_none or release.min_rel is None):
-				release.min_rel = form["min_rel"].data.get_actual()
+				release.min_rel = form["min_rel"].data.getActual()
 			if form["set_max"].data and (not only_change_none or release.max_rel is None):
-				release.max_rel = form["max_rel"].data.get_actual()
+				release.max_rel = form["max_rel"].data.getActual()
 
 		db.session.commit()
 
-		return redirect(package.get_url("packages.list_releases"))
+		return redirect(package.getDetailsURL())
 
 	return render_template("packages/release_bulk_change.html", package=package, form=form)
 
 
-@bp.route("/packages/<author>/<name>/releases/<int:id>/delete/", methods=["POST"])
+@bp.route("/packages/<author>/<name>/releases/<id>/delete/", methods=["POST"])
 @login_required
 @is_package_page
 def delete_release(package, id):
@@ -235,26 +215,22 @@ def delete_release(package, id):
 	if release is None or release.package != package:
 		abort(404)
 
-	if not release.check_perm(current_user, Permission.DELETE_RELEASE):
-		return redirect(package.get_url("packages.list_releases"))
+	if not release.checkPerm(current_user, Permission.DELETE_RELEASE):
+		return redirect(release.getEditURL())
 
 	db.session.delete(release)
 	db.session.commit()
 
-	return redirect(package.get_url("packages.view"))
+	return redirect(package.getDetailsURL())
 
 
 class PackageUpdateConfigFrom(FlaskForm):
-	trigger = RadioField(lazy_gettext("Trigger"), [InputRequired()],
-			choices=[(PackageUpdateTrigger.COMMIT, lazy_gettext("New Commit")),
-					(PackageUpdateTrigger.TAG, lazy_gettext("New Tag"))],
-			coerce=PackageUpdateTrigger.coerce, default=PackageUpdateTrigger.TAG)
-	ref     = StringField(lazy_gettext("Branch name"), [Optional()], default=None)
-	action  = RadioField(lazy_gettext("Action"), [InputRequired()],
-			choices=[("notification", lazy_gettext("Send notification and mark as outdated")), ("make_release", lazy_gettext("Create release"))],
-			default="make_release")
-	submit  = SubmitField(lazy_gettext("Save Settings"))
-	disable = SubmitField(lazy_gettext("Disable Automation"))
+	trigger = RadioField("Trigger", [InputRequired()], choices=PackageUpdateTrigger.choices(), coerce=PackageUpdateTrigger.coerce,
+			default=PackageUpdateTrigger.TAG)
+	ref     = StringField("Branch name", [Optional()], default=None)
+	action  = RadioField("Action", [InputRequired()], choices=[("notification", "Send notification and mark as outdated"), ("make_release", "Create release")], default="make_release")
+	submit  = SubmitField("Save Settings")
+	disable = SubmitField("Disable Automation")
 
 
 def set_update_config(package, form):
@@ -263,7 +239,7 @@ def set_update_config(package, form):
 		db.session.add(package.update_config)
 
 	form.populate_obj(package.update_config)
-	package.update_config.ref = nonempty_or_none(form.ref.data)
+	package.update_config.ref = nonEmptyOrNone(form.ref.data)
 	package.update_config.make_release = form.action.data == "make_release"
 
 	if package.update_config.trigger == PackageUpdateTrigger.COMMIT:
@@ -289,12 +265,12 @@ def set_update_config(package, form):
 @login_required
 @is_package_page
 def update_config(package):
-	if not package.check_perm(current_user, Permission.MAKE_RELEASE):
+	if not package.checkPerm(current_user, Permission.MAKE_RELEASE):
 		abort(403)
 
 	if not package.repo:
-		flash(gettext("Please add a Git repository URL in order to set up automatic releases"), "danger")
-		return redirect(package.get_url("packages.create_edit"))
+		flash("Please add a Git repository URL in order to set up automatic releases", "danger")
+		return redirect(package.getEditURL())
 
 	form = PackageUpdateConfigFrom(obj=package.update_config)
 	if request.method == "GET":
@@ -304,12 +280,9 @@ def update_config(package):
 			form.trigger.data = PackageUpdateTrigger.COMMIT
 			form.action.data = "notification"
 
-		if "trigger" in request.args:
-			form.trigger.data = PackageUpdateTrigger.get(request.args["trigger"])
-
 	if form.validate_on_submit():
 		if form.disable.data:
-			flash(gettext("Deleted update configuration"), "success")
+			flash("Deleted update configuration", "success")
 			if package.update_config:
 				db.session.delete(package.update_config)
 			db.session.commit()
@@ -317,10 +290,10 @@ def update_config(package):
 			set_update_config(package, form)
 
 		if not form.disable.data and package.releases.count() == 0:
-			flash(gettext("Now, please create an initial release"), "success")
-			return redirect(package.get_url("packages.create_release"))
+			flash("Now, please create an initial release", "success")
+			return redirect(package.getCreateReleaseURL())
 
-		return redirect(package.get_url("packages.list_releases"))
+		return redirect(package.getDetailsURL())
 
 	return render_template("packages/update_config.html", package=package, form=form)
 
@@ -329,11 +302,11 @@ def update_config(package):
 @login_required
 @is_package_page
 def setup_releases(package):
-	if not package.check_perm(current_user, Permission.MAKE_RELEASE):
+	if not package.checkPerm(current_user, Permission.MAKE_RELEASE):
 		abort(403)
 
 	if package.update_config:
-		return redirect(package.get_url("packages.update_config"))
+		return redirect(package.getUpdateConfigURL())
 
 	return render_template("packages/release_wizard.html", package=package)
 
@@ -349,7 +322,7 @@ def bulk_update_config(username=None):
 	if not user:
 		abort(404)
 
-	if current_user != user and not current_user.rank.at_least(UserRank.EDITOR):
+	if current_user != user and not current_user.rank.atLeast(UserRank.EDITOR):
 		abort(403)
 
 	form = PackageUpdateConfigFrom()

app/blueprints/packages/reviews.py

@@ -14,22 +14,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from collections import namedtuple
+from . import bp
 
-import typing
-from flask import render_template, request, redirect, flash, url_for, abort, jsonify
-from flask_babel import gettext, lazy_gettext
+from flask import *
 from flask_login import current_user, login_required
 from flask_wtf import FlaskForm
-from wtforms import StringField, TextAreaField, SubmitField, RadioField
-from wtforms.validators import InputRequired, Length
-
-from app.models import db, PackageReview, Thread, ThreadReply, NotificationType, PackageReviewVote, Package, UserRank, \
-	Permission, AuditSeverity, PackageState
-from app.tasks.webhooktasks import post_discord_webhook
-from app.utils import is_package_page, add_notification, get_int_or_abort, is_yes, is_safe_url, rank_required, \
-	add_audit_log, has_blocked_domains, should_return_json
-from . import bp
+from wtforms import *
+from wtforms.validators import *
+from app.models import db, PackageReview, Thread, ThreadReply, NotificationType
+from app.utils import is_package_page, addNotification, get_int_or_abort
 
 
 @bp.route("/reviews/")
@@ -37,223 +30,114 @@ def list_reviews():
 	page = get_int_or_abort(request.args.get("page"), 1)
 	num = min(40, get_int_or_abort(request.args.get("n"), 100))
 
-	pagination = PackageReview.query.order_by(db.desc(PackageReview.created_at)).paginate(page=page, per_page=num)
+	pagination = PackageReview.query.order_by(db.desc(PackageReview.created_at)).paginate(page, num, True)
 	return render_template("packages/reviews_list.html", pagination=pagination, reviews=pagination.items)
 
 
 class ReviewForm(FlaskForm):
-	title = StringField(lazy_gettext("Title"), [InputRequired(), Length(3, 100)])
-	comment = TextAreaField(lazy_gettext("Comment"), [InputRequired(), Length(10, 2000)])
-	rating = RadioField(lazy_gettext("Rating"), [InputRequired()],
-			choices=[("5", lazy_gettext("Yes")), ("3", lazy_gettext("Neutral")), ("1", lazy_gettext("No"))])
-	btn_submit = SubmitField(lazy_gettext("Save"))
-
+	title	= StringField("Title", [InputRequired(), Length(3,100)])
+	comment = TextAreaField("Comment", [InputRequired(), Length(10, 2000)])
+	recommends = RadioField("Private", [InputRequired()], choices=[("yes", "Yes"), ("no", "No")])
+	submit  = SubmitField("Save")
 
 @bp.route("/packages/<author>/<name>/review/", methods=["GET", "POST"])
 @login_required
 @is_package_page
 def review(package):
 	if current_user in package.maintainers:
-		flash(gettext("You can't review your own package!"), "danger")
-		return redirect(package.get_url("packages.view"))
-
-	if package.state != PackageState.APPROVED:
-		abort(404)
+		flash("You can't review your own package!", "danger")
+		return redirect(package.getDetailsURL())
 
 	review = PackageReview.query.filter_by(package=package, author=current_user).first()
-	can_review = review is not None or current_user.can_review_ratelimit()
-
-	if not can_review:
-		flash(gettext("You've reviewed too many packages recently. Please wait before trying again, and consider making your reviews more detailed"), "danger")
 
 	form = ReviewForm(formdata=request.form, obj=review)
 
 	# Set default values
 	if request.method == "GET" and review:
 		form.title.data = review.thread.title
-		form.rating.data = str(review.rating)
-		form.comment.data = review.thread.first_reply.comment
+		form.recommends.data = "yes" if review.recommends else "no"
+		form.comment.data = review.thread.replies[0].comment
 
 	# Validate and submit
-	elif can_review and form.validate_on_submit():
-		if has_blocked_domains(form.comment.data, current_user.username, f"review of {package.get_id()}"):
-			flash(gettext("Linking to blocked sites is not allowed"), "danger")
+	elif form.validate_on_submit():
+		was_new = False
+		if not review:
+			was_new = True
+			review = PackageReview()
+			review.package = package
+			review.author  = current_user
+			db.session.add(review)
+
+		review.recommends = form.recommends.data == "yes"
+
+		thread = review.thread
+		if not thread:
+			thread = Thread()
+			thread.author  = current_user
+			thread.private = False
+			thread.package = package
+			thread.review = review
+			db.session.add(thread)
+
+			thread.watchers.append(current_user)
+
+			reply = ThreadReply()
+			reply.thread  = thread
+			reply.author  = current_user
+			reply.comment = form.comment.data
+			db.session.add(reply)
+
+			thread.replies.append(reply)
 		else:
-			was_new = False
-			if not review:
-				was_new = True
-				review = PackageReview()
-				review.package = package
-				review.author  = current_user
-				db.session.add(review)
+			reply = thread.replies[0]
+			reply.comment = form.comment.data
 
-			review.rating = int(form.rating.data)
+		thread.title   = form.title.data
 
-			thread = review.thread
-			if not thread:
-				thread = Thread()
-				thread.author  = current_user
-				thread.private = False
-				thread.package = package
-				thread.review = review
-				db.session.add(thread)
+		db.session.commit()
 
-				thread.watchers.append(current_user)
+		package.recalcScore()
 
-				reply = ThreadReply()
-				reply.thread  = thread
-				reply.author  = current_user
-				reply.comment = form.comment.data
-				db.session.add(reply)
+		if was_new:
+			notif_msg = "New review '{}'".format(form.title.data)
+			type = NotificationType.NEW_REVIEW
+		else:
+			notif_msg = "Updated review '{}'".format(form.title.data)
+			type = NotificationType.OTHER
 
-				thread.replies.append(reply)
-			else:
-				reply = thread.first_reply
-				reply.comment = form.comment.data
+		addNotification(package.maintainers, current_user, type, notif_msg,
+				url_for("threads.view", id=thread.id), package)
 
-			thread.title   = form.title.data
+		db.session.commit()
 
-			db.session.commit()
-
-			package.recalculate_score()
-
-			if was_new:
-				notif_msg = "New review '{}'".format(form.title.data)
-				type = NotificationType.NEW_REVIEW
-			else:
-				notif_msg = "Updated review '{}'".format(form.title.data)
-				type = NotificationType.OTHER
-
-			add_notification(package.maintainers, current_user, type, notif_msg,
-							 url_for("threads.view", id=thread.id), package)
-
-			if was_new:
-				post_discord_webhook.delay(thread.author.display_name,
-						"Reviewed {}: {}".format(package.title, thread.get_view_url(absolute=True)), False)
-
-			db.session.commit()
-
-			return redirect(package.get_url("packages.view"))
+		return redirect(package.getDetailsURL())
 
 	return render_template("packages/review_create_edit.html",
 			form=form, package=package, review=review)
 
 
-@bp.route("/packages/<author>/<name>/reviews/<reviewer>/delete/", methods=["POST"])
+@bp.route("/packages/<author>/<name>/review/delete/", methods=["POST"])
 @login_required
 @is_package_page
-def delete_review(package, reviewer):
-	review = PackageReview.query \
-		.filter(PackageReview.package == package, PackageReview.author.has(username=reviewer)) \
-		.first()
+def delete_review(package):
+	review = PackageReview.query.filter_by(package=package, author=current_user).first()
 	if review is None or review.package != package:
 		abort(404)
 
-	if not review.check_perm(current_user, Permission.DELETE_REVIEW):
-		abort(403)
-
 	thread = review.thread
 
 	reply = ThreadReply()
 	reply.thread  = thread
 	reply.author  = current_user
 	reply.comment = "_converted review into a thread_"
-	reply.is_status_update = True
 	db.session.add(reply)
 
 	thread.review = None
 
-	msg = "Converted review by {} to thread".format(review.author.display_name)
-	add_audit_log(AuditSeverity.MODERATION if current_user.username != reviewer else AuditSeverity.NORMAL,
-				  current_user, msg, thread.get_view_url(), thread.package)
-
 	notif_msg = "Deleted review '{}', comments were kept as a thread".format(thread.title)
-	add_notification(package.maintainers, current_user, NotificationType.OTHER, notif_msg, url_for("threads.view", id=thread.id), package)
+	addNotification(package.maintainers, current_user, NotificationType.OTHER, notif_msg, url_for("threads.view", id=thread.id), package)
 
 	db.session.delete(review)
-
-	package.recalculate_score()
-
 	db.session.commit()
 
-	return redirect(thread.get_view_url())
-
-
-def handle_review_vote(package: Package, review_id: int) -> typing.Optional[str]:
-	if current_user in package.maintainers:
-		return gettext("You can't vote on the reviews on your own package!")
-
-	review: PackageReview = PackageReview.query.get(review_id)
-	if review is None or review.package != package:
-		abort(404)
-
-	if review.author == current_user:
-		return gettext("You can't vote on your own reviews!")
-
-	is_positive = is_yes(request.form["is_positive"])
-
-	vote = PackageReviewVote.query.filter_by(review=review, user=current_user).first()
-	if vote is None:
-		vote = PackageReviewVote()
-		vote.review = review
-		vote.user = current_user
-		vote.is_positive = is_positive
-		db.session.add(vote)
-	elif vote.is_positive == is_positive:
-		db.session.delete(vote)
-	else:
-		vote.is_positive = is_positive
-
-	review.update_score()
-	db.session.commit()
-
-
-@bp.route("/packages/<author>/<name>/review/<int:review_id>/", methods=["POST"])
-@login_required
-@is_package_page
-def review_vote(package, review_id):
-	msg = handle_review_vote(package, review_id)
-	if should_return_json():
-		if msg:
-			return jsonify({"success": False, "error": msg}), 403
-		else:
-			return jsonify({"success": True})
-
-	if msg:
-		flash(msg, "danger")
-
-	next_url = request.args.get("r")
-	if next_url and is_safe_url(next_url):
-		return redirect(next_url)
-	else:
-		return redirect(review.thread.get_view_url())
-
-
-@bp.route("/packages/<author>/<name>/review-votes/")
-@rank_required(UserRank.ADMIN)
-@is_package_page
-def review_votes(package):
-	user_biases = {}
-	for review in package.reviews:
-		review_sign = review.as_weight()
-		for vote in review.votes:
-			user_biases[vote.user.username] = user_biases.get(vote.user.username, [0, 0])
-			vote_sign = 1 if vote.is_positive else -1
-			vote_bias = review_sign * vote_sign
-			if vote_bias == 1:
-				user_biases[vote.user.username][0] += 1
-			else:
-				user_biases[vote.user.username][1] += 1
-
-	BiasInfo = namedtuple("BiasInfo", "username balance with_ against no_vote perc_with")
-	user_biases_info = []
-	for username, bias in user_biases.items():
-		total_votes = bias[0] + bias[1]
-		balance = bias[0] - bias[1]
-		perc_with = round((100 * bias[0]) / total_votes)
-		user_biases_info.append(BiasInfo(username, balance, bias[0], bias[1], len(package.reviews) - total_votes, perc_with))
-
-	user_biases_info.sort(key=lambda x: -abs(x.balance))
-
-	return render_template("packages/review_votes.html", package=package, reviews=package.reviews,
-			user_biases=user_biases_info)
+	return redirect(thread.getViewURL())

app/blueprints/packages/screenshots.py

@@ -14,44 +14,46 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from flask import render_template, request, redirect, flash, url_for, abort
-from flask_babel import lazy_gettext, gettext
-from flask_login import login_required, current_user
-from flask_wtf import FlaskForm
-from wtforms import StringField, SubmitField, BooleanField, FileField
-from wtforms.validators import InputRequired, Length, DataRequired, Optional
-from wtforms_sqlalchemy.fields import QuerySelectField
 
+from flask import *
+from flask_wtf import FlaskForm
+from flask_login import login_required
+from wtforms import *
+from wtforms.ext.sqlalchemy.fields import QuerySelectField
+from wtforms.validators import *
+
+from app.utils import *
+from . import bp
 from app.logic.LogicError import LogicError
 from app.logic.screenshots import do_create_screenshot, do_order_screenshots
-from . import bp, get_package_tabs
-from app.models import Permission, db, PackageScreenshot
-from app.utils import is_package_page
 
 
 class CreateScreenshotForm(FlaskForm):
-	title	   = StringField(lazy_gettext("Title/Caption"), [Optional(), Length(-1, 100)])
-	file_upload = FileField(lazy_gettext("File Upload"), [InputRequired()])
-	submit	   = SubmitField(lazy_gettext("Save"))
+	title	   = StringField("Title/Caption", [Optional(), Length(-1, 100)])
+	fileUpload = FileField("File Upload", [InputRequired()])
+	submit	   = SubmitField("Save")
 
 
 class EditScreenshotForm(FlaskForm):
-	title	 = StringField(lazy_gettext("Title/Caption"), [Optional(), Length(-1, 100)])
-	approved = BooleanField(lazy_gettext("Is Approved"))
-	submit   = SubmitField(lazy_gettext("Save"))
+	title	 = StringField("Title/Caption", [Optional(), Length(-1, 100)])
+	approved = BooleanField("Is Approved")
+	submit   = SubmitField("Save")
 
 
 class EditPackageScreenshotsForm(FlaskForm):
-	cover_image      = QuerySelectField(lazy_gettext("Cover Image"), [DataRequired()], allow_blank=True, get_pk=lambda a: a.id, get_label=lambda a: a.title)
-	submit	         = SubmitField(lazy_gettext("Save"))
+	cover_image      = QuerySelectField("Cover Image", [DataRequired()], allow_blank=True, get_pk=lambda a: a.id, get_label=lambda a: a.title)
+	submit	         = SubmitField("Save")
 
 
 @bp.route("/packages/<author>/<name>/screenshots/", methods=["GET", "POST"])
 @login_required
 @is_package_page
 def screenshots(package):
-	if not package.check_perm(current_user, Permission.ADD_SCREENSHOTS):
-		return redirect(package.get_url("packages.view"))
+	if not package.checkPerm(current_user, Permission.ADD_SCREENSHOTS):
+		return redirect(package.getDetailsURL())
+
+	if package.screenshots.count() == 0:
+		return redirect(package.getNewScreenshotURL())
 
 	form = EditPackageScreenshotsForm(obj=package)
 	form.cover_image.query = package.screenshots
@@ -61,7 +63,7 @@ def screenshots(package):
 		if order:
 			try:
 				do_order_screenshots(current_user, package, order.split(","))
-				return redirect(package.get_url("packages.view"))
+				return redirect(package.getDetailsURL())
 			except LogicError as e:
 				flash(e.message, "danger")
 
@@ -69,30 +71,29 @@ def screenshots(package):
 			form.populate_obj(package)
 			db.session.commit()
 
-	return render_template("packages/screenshots.html", package=package, form=form,
-			tabs=get_package_tabs(current_user, package), current_tab="screenshots")
+	return render_template("packages/screenshots.html", package=package, form=form)
 
 
 @bp.route("/packages/<author>/<name>/screenshots/new/", methods=["GET", "POST"])
 @login_required
 @is_package_page
 def create_screenshot(package):
-	if not package.check_perm(current_user, Permission.ADD_SCREENSHOTS):
-		return redirect(package.get_url("packages.view"))
+	if not package.checkPerm(current_user, Permission.ADD_SCREENSHOTS):
+		return redirect(package.getDetailsURL())
 
 	# Initial form class from post data and default data
 	form = CreateScreenshotForm()
 	if form.validate_on_submit():
 		try:
-			do_create_screenshot(current_user, package, form.title.data, form.file_upload.data, False)
-			return redirect(package.get_url("packages.screenshots"))
+			do_create_screenshot(current_user, package, form.title.data, form.fileUpload.data)
+			return redirect(package.getEditScreenshotsURL())
 		except LogicError as e:
 			flash(e.message, "danger")
 
 	return render_template("packages/screenshot_new.html", package=package, form=form)
 
 
-@bp.route("/packages/<author>/<name>/screenshots/<int:id>/edit/", methods=["GET", "POST"])
+@bp.route("/packages/<author>/<name>/screenshots/<id>/edit/", methods=["GET", "POST"])
 @login_required
 @is_package_page
 def edit_screenshot(package, id):
@@ -100,31 +101,31 @@ def edit_screenshot(package, id):
 	if screenshot is None or screenshot.package != package:
 		abort(404)
 
-	can_edit = package.check_perm(current_user, Permission.ADD_SCREENSHOTS)
-	can_approve = package.check_perm(current_user, Permission.APPROVE_SCREENSHOT)
-	if not (can_edit or can_approve):
-		return redirect(package.get_url("packages.screenshots"))
+	canEdit	= package.checkPerm(current_user, Permission.ADD_SCREENSHOTS)
+	canApprove = package.checkPerm(current_user, Permission.APPROVE_SCREENSHOT)
+	if not (canEdit or canApprove):
+		return redirect(package.getEditScreenshotsURL())
 
 	# Initial form class from post data and default data
 	form = EditScreenshotForm(obj=screenshot)
 	if form.validate_on_submit():
-		was_approved = screenshot.approved
+		wasApproved = screenshot.approved
 
-		if can_edit:
+		if canEdit:
 			screenshot.title = form["title"].data or "Untitled"
 
-		if can_approve:
+		if canApprove:
 			screenshot.approved = form["approved"].data
 		else:
-			screenshot.approved = was_approved
+			screenshot.approved = wasApproved
 
 		db.session.commit()
-		return redirect(package.get_url("packages.screenshots"))
+		return redirect(package.getEditScreenshotsURL())
 
 	return render_template("packages/screenshot_edit.html", package=package, screenshot=screenshot, form=form)
 
 
-@bp.route("/packages/<author>/<name>/screenshots/<int:id>/delete/", methods=["POST"])
+@bp.route("/packages/<author>/<name>/screenshots/<id>/delete/", methods=["POST"])
 @login_required
 @is_package_page
 def delete_screenshot(package, id):
@@ -132,8 +133,8 @@ def delete_screenshot(package, id):
 	if screenshot is None or screenshot.package != package:
 		abort(404)
 
-	if not package.check_perm(current_user, Permission.ADD_SCREENSHOTS):
-		flash(gettext("Permission denied"), "danger")
+	if not package.checkPerm(current_user, Permission.ADD_SCREENSHOTS):
+		flash("Permission denied", "danger")
 		return redirect(url_for("homepage.home"))
 
 	if package.cover_image == screenshot:
@@ -143,4 +144,4 @@ def delete_screenshot(package, id):
 	db.session.delete(screenshot)
 	db.session.commit()
 
-	return redirect(package.get_url("packages.screenshots"))
+	return redirect(package.getEditScreenshotsURL())

app/blueprints/report/__init__.py

@@ -1,67 +0,0 @@
-# ContentDB
-# Copyright (C) 2022 rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-from flask import Blueprint, request, render_template, url_for, abort
-from flask_babel import lazy_gettext
-from flask_login import current_user
-from flask_wtf import FlaskForm
-from werkzeug.utils import redirect
-from wtforms import TextAreaField, SubmitField
-from wtforms.validators import InputRequired, Length
-
-from app.models import User, UserRank
-from app.tasks.emails import send_user_email
-from app.tasks.webhooktasks import post_discord_webhook
-from app.utils import is_no, abs_url_samesite
-
-bp = Blueprint("report", __name__)
-
-
-class ReportForm(FlaskForm):
-	message = TextAreaField(lazy_gettext("Message"), [InputRequired(), Length(10, 10000)])
-	submit = SubmitField(lazy_gettext("Report"))
-
-
-@bp.route("/report/", methods=["GET", "POST"])
-def report():
-	is_anon = not current_user.is_authenticated or not is_no(request.args.get("anon"))
-
-	url = request.args.get("url")
-	if url:
-		if url.startswith("/report/"):
-			abort(404)
-
-		url = abs_url_samesite(url)
-
-	form = ReportForm(formdata=request.form) if current_user.is_authenticated else None
-	if form and form.validate_on_submit():
-		if current_user.is_authenticated:
-			user_info = f"{current_user.username}"
-		else:
-			user_info = request.headers.get("X-Forwarded-For") or request.remote_addr
-
-		text = f"{url}\n\n{form.message.data}"
-
-		task = None
-		for admin in User.query.filter_by(rank=UserRank.ADMIN).all():
-			task = send_user_email.delay(admin.email, admin.locale or "en",
-					f"User report from {user_info}", text)
-
-		post_discord_webhook.delay(None if is_anon else current_user.username, f"**New Report**\n{url}\n\n{form.message.data}", True)
-
-		return redirect(url_for("tasks.check", id=task.id, r=url_for("homepage.home")))
-
-	return render_template("report/index.html", form=form, url=url, is_anon=is_anon, noindex=url is not None)

app/blueprints/tasks/__init__.py

@@ -14,31 +14,28 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from flask import Blueprint, jsonify, url_for, request, redirect, render_template
-from flask_login import login_required, current_user
+
+from flask import *
+from flask_login import login_required
 
 from app import csrf
-from app.models import UserRank
 from app.tasks import celery
-from app.tasks.importtasks import get_meta
-from app.utils import should_return_json
+from app.tasks.importtasks import getMeta
+from app.utils import *
 
 bp = Blueprint("tasks", __name__)
 
-
 @csrf.exempt
 @bp.route("/tasks/getmeta/new/", methods=["POST"])
 @login_required
 def start_getmeta():
-	from flask import request
 	author = request.args.get("author")
 	author = current_user.forums_username if author is None else author
-	aresult = get_meta.delay(request.args.get("url"), author)
+	aresult = getMeta.delay(request.args.get("url"), author)
 	return jsonify({
 		"poll_url": url_for("tasks.check", id=aresult.id),
 	})
 
-
 @bp.route("/tasks/<id>/")
 def check(id):
 	result = celery.AsyncResult(id)
@@ -46,13 +43,14 @@ def check(id):
 	traceback = result.traceback
 	result = result.result
 
+	None
 	if isinstance(result, Exception):
 		info = {
 				'id': id,
 				'status': status,
 			}
 
-		if current_user.is_authenticated and current_user.rank.at_least(UserRank.ADMIN):
+		if current_user.is_authenticated and current_user.rank.atLeast(UserRank.ADMIN):
 			info["error"] = str(traceback)
 		elif str(result)[1:12] == "TaskError: ":
 			info["error"] = str(result)[12:-1]
@@ -65,7 +63,7 @@ def check(id):
 				'result': result,
 			}
 
-	if should_return_json():
+	if shouldReturnJson():
 		return jsonify(info)
 	else:
 		r = request.args.get("r")

app/blueprints/threads/__init__.py

@@ -13,39 +13,30 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-from flask import Blueprint, request, render_template, abort, flash, redirect, url_for
-from flask_babel import gettext, lazy_gettext
-from sqlalchemy import or_
-from sqlalchemy.orm import selectinload, joinedload
-
-from app.markdown import get_user_mentions, render_markdown
-from app.tasks.webhooktasks import post_discord_webhook
+from flask import *
 
 bp = Blueprint("threads", __name__)
 
 from flask_login import current_user, login_required
-from app.models import Package, db, User, Permission, Thread, UserRank, AuditSeverity, \
-	NotificationType, ThreadReply
-from app.utils import add_notification, is_yes, add_audit_log, get_system_user, has_blocked_domains
+from app import menu
+from app.models import *
+from app.utils import addNotification, isYes, addAuditLog
 from flask_wtf import FlaskForm
-from wtforms import StringField, TextAreaField, SubmitField, BooleanField
-from wtforms.validators import InputRequired, Length
+from wtforms import *
+from wtforms.validators import *
 from app.utils import get_int_or_abort
 
-
+@menu.register_menu(bp, ".threads", "Threads", order=20)
 @bp.route("/threads/")
 def list_all():
 	query = Thread.query
 	if not Permission.SEE_THREAD.check(current_user):
 		query = query.filter_by(private=False)
 
-	package = None
 	pid = request.args.get("pid")
 	if pid:
 		pid = get_int_or_abort(pid)
-		package = Package.query.get_or_404(pid)
-		query = query.filter_by(package=package)
+		query = query.filter_by(package_id=pid)
 
 	query = query.filter_by(review_id=None)
 
@@ -54,77 +45,77 @@ def list_all():
 	page = get_int_or_abort(request.args.get("page"), 1)
 	num = min(40, get_int_or_abort(request.args.get("n"), 100))
 
-	pagination = query.paginate(page=page, per_page=num)
+	pagination = query.paginate(page, num, True)
 
-	return render_template("threads/list.html", pagination=pagination, threads=pagination.items,
-			package=package, noindex=pid)
+	return render_template("threads/list.html", pagination=pagination, threads=pagination.items)
 
 
 @bp.route("/threads/<int:id>/subscribe/", methods=["POST"])
 @login_required
 def subscribe(id):
 	thread = Thread.query.get(id)
-	if thread is None or not thread.check_perm(current_user, Permission.SEE_THREAD):
+	if thread is None or not thread.checkPerm(current_user, Permission.SEE_THREAD):
 		abort(404)
 
 	if current_user in thread.watchers:
-		flash(gettext("Already subscribed!"), "success")
+		flash("Already subscribed!", "success")
 	else:
-		flash(gettext("Subscribed to thread"), "success")
+		flash("Subscribed to thread", "success")
 		thread.watchers.append(current_user)
 		db.session.commit()
 
-	return redirect(thread.get_view_url())
+	return redirect(thread.getViewURL())
 
 
 @bp.route("/threads/<int:id>/unsubscribe/", methods=["POST"])
 @login_required
 def unsubscribe(id):
 	thread = Thread.query.get(id)
-	if thread is None or not thread.check_perm(current_user, Permission.SEE_THREAD):
+	if thread is None or not thread.checkPerm(current_user, Permission.SEE_THREAD):
 		abort(404)
 
 	if current_user in thread.watchers:
-		flash(gettext("Unsubscribed!"), "success")
+		flash("Unsubscribed!", "success")
 		thread.watchers.remove(current_user)
 		db.session.commit()
 	else:
-		flash(gettext("Already not subscribed!"), "success")
+		flash("Already not subscribed!", "success")
 
-	return redirect(thread.get_view_url())
+	return redirect(thread.getViewURL())
 
 
 @bp.route("/threads/<int:id>/set-lock/", methods=["POST"])
 @login_required
 def set_lock(id):
 	thread = Thread.query.get(id)
-	if thread is None or not thread.check_perm(current_user, Permission.LOCK_THREAD):
+	if thread is None or not thread.checkPerm(current_user, Permission.LOCK_THREAD):
 		abort(404)
 
-	thread.locked = is_yes(request.args.get("lock"))
+	thread.locked = isYes(request.args.get("lock"))
 	if thread.locked is None:
 		abort(400)
 
+	msg = None
 	if thread.locked:
 		msg = "Locked thread '{}'".format(thread.title)
-		flash(gettext("Locked thread"), "success")
+		flash("Locked thread", "success")
 	else:
 		msg = "Unlocked thread '{}'".format(thread.title)
-		flash(gettext("Unlocked thread"), "success")
+		flash("Unlocked thread", "success")
 
-	add_notification(thread.watchers, current_user, NotificationType.OTHER, msg, thread.get_view_url(), thread.package)
-	add_audit_log(AuditSeverity.MODERATION, current_user, msg, thread.get_view_url(), thread.package)
+	addNotification(thread.watchers, current_user, NotificationType.OTHER, msg, thread.getViewURL(), thread.package)
+	addAuditLog(AuditSeverity.MODERATION, current_user, NotificationType.OTHER, msg, thread.getViewURL(), thread.package)
 
 	db.session.commit()
 
-	return redirect(thread.get_view_url())
+	return redirect(thread.getViewURL())
 
 
 @bp.route("/threads/<int:id>/delete/", methods=["GET", "POST"])
 @login_required
 def delete_thread(id):
 	thread = Thread.query.get(id)
-	if thread is None or not thread.check_perm(current_user, Permission.DELETE_THREAD):
+	if thread is None or not thread.checkPerm(current_user, Permission.DELETE_THREAD):
 		abort(404)
 
 	if request.method == "GET":
@@ -136,7 +127,7 @@ def delete_thread(id):
 
 	db.session.delete(thread)
 
-	add_audit_log(AuditSeverity.MODERATION, current_user, msg, None, thread.package, summary)
+	addAuditLog(AuditSeverity.MODERATION, current_user, msg, None, thread.package, summary)
 
 	db.session.commit()
 
@@ -158,28 +149,28 @@ def delete_reply(id):
 	if reply is None or reply.thread != thread:
 		abort(404)
 
-	if thread.first_reply == reply:
-		flash(gettext("Cannot delete thread opening post!"), "danger")
-		return redirect(thread.get_view_url())
+	if thread.replies[0] == reply:
+		flash("Cannot delete thread opening post!", "danger")
+		return redirect(thread.getViewURL())
 
-	if not reply.check_perm(current_user, Permission.DELETE_REPLY):
+	if not reply.checkPerm(current_user, Permission.DELETE_REPLY):
 		abort(403)
 
 	if request.method == "GET":
 		return render_template("threads/delete_reply.html", thread=thread, reply=reply)
 
 	msg = "Deleted reply by {}".format(reply.author.display_name)
-	add_audit_log(AuditSeverity.MODERATION, current_user, msg, thread.get_view_url(), thread.package, reply.comment)
+	addAuditLog(AuditSeverity.MODERATION, current_user, msg, thread.getViewURL(), thread.package, reply.comment)
 
 	db.session.delete(reply)
 	db.session.commit()
 
-	return redirect(thread.get_view_url())
+	return redirect(thread.getViewURL())
 
 
 class CommentForm(FlaskForm):
-	comment = TextAreaField(lazy_gettext("Comment"), [InputRequired(), Length(2, 2000)])
-	btn_submit = SubmitField(lazy_gettext("Comment"))
+	comment = TextAreaField("Comment", [InputRequired(), Length(10, 2000)])
+	submit  = SubmitField("Comment")
 
 
 @bp.route("/threads/<int:id>/edit/", methods=["GET", "POST"])
@@ -193,95 +184,75 @@ def edit_reply(id):
 	if reply_id is None:
 		abort(404)
 
-	reply: ThreadReply = ThreadReply.query.get(reply_id)
+	reply = ThreadReply.query.get(reply_id)
 	if reply is None or reply.thread != thread:
 		abort(404)
 
-	if not reply.check_perm(current_user, Permission.EDIT_REPLY):
+	if not reply.checkPerm(current_user, Permission.EDIT_REPLY):
 		abort(403)
 
 	form = CommentForm(formdata=request.form, obj=reply)
 	if form.validate_on_submit():
 		comment = form.comment.data
-		if has_blocked_domains(comment, current_user.username, f"edit to reply {reply.get_url(True)}"):
-			flash(gettext("Linking to blocked sites is not allowed"), "danger")
-		else:
-			msg = "Edited reply by {}".format(reply.author.display_name)
-			severity = AuditSeverity.NORMAL if current_user == reply.author else AuditSeverity.MODERATION
-			add_notification(reply.author, current_user, NotificationType.OTHER, msg, thread.get_view_url(), thread.package)
-			add_audit_log(severity, current_user, msg, thread.get_view_url(), thread.package, reply.comment)
 
-			reply.comment = comment
+		msg = "Edited reply by {}".format(reply.author.display_name)
+		severity = AuditSeverity.NORMAL if current_user == reply.author else AuditSeverity.MODERATION
+		addNotification(reply.author, current_user, NotificationType.OTHER, msg, thread.getViewURL(), thread.package)
+		addAuditLog(severity, current_user, msg, thread.getViewURL(), thread.package, reply.comment)
 
-			db.session.commit()
+		reply.comment = comment
 
-			return redirect(thread.get_view_url())
+		db.session.commit()
+
+		return redirect(thread.getViewURL())
 
 	return render_template("threads/edit_reply.html", thread=thread, reply=reply, form=form)
 
 
 @bp.route("/threads/<int:id>/", methods=["GET", "POST"])
 def view(id):
-	thread: Thread = Thread.query.get(id)
-	if thread is None or not thread.check_perm(current_user, Permission.SEE_THREAD):
+	thread = Thread.query.get(id)
+	if thread is None or not thread.checkPerm(current_user, Permission.SEE_THREAD):
 		abort(404)
 
-	form = CommentForm(formdata=request.form) if thread.check_perm(current_user, Permission.COMMENT_THREAD) else None
+	if current_user.is_authenticated and request.method == "POST":
+		comment = request.form["comment"]
 
-	# Check that title is none to load comments into textarea if redirected from new thread page
-	if form and form.validate_on_submit() and request.form.get("title") is None:
-		comment = form.comment.data
+		if not thread.checkPerm(current_user, Permission.COMMENT_THREAD):
+			flash("You cannot comment on this thread", "danger")
+			return redirect(thread.getViewURL())
 
-		if not current_user.can_comment_ratelimit():
-			flash(gettext("Please wait before commenting again"), "danger")
-			return redirect(thread.get_view_url())
+		if not current_user.canCommentRL():
+			flash("Please wait before commenting again", "danger")
+			return redirect(thread.getViewURL())
 
-		if has_blocked_domains(comment, current_user.username, f"reply to {thread.get_view_url(True)}"):
-			flash(gettext("Linking to blocked sites is not allowed"), "danger")
-			return render_template("threads/view.html", thread=thread, form=form)
+		if 2000 >= len(comment) > 3:
+			reply = ThreadReply()
+			reply.author = current_user
+			reply.comment = comment
+			db.session.add(reply)
 
-		reply = ThreadReply()
-		reply.author = current_user
-		reply.comment = comment
-		db.session.add(reply)
+			thread.replies.append(reply)
+			if not current_user in thread.watchers:
+				thread.watchers.append(current_user)
 
-		thread.replies.append(reply)
-		if current_user not in thread.watchers:
-			thread.watchers.append(current_user)
+			msg = "New comment on '{}'".format(thread.title)
+			addNotification(thread.watchers, current_user, NotificationType.THREAD_REPLY, msg, thread.getViewURL(), thread.package)
+			db.session.commit()
 
-		for mentioned_username in get_user_mentions(render_markdown(comment)):
-			mentioned = User.query.filter_by(username=mentioned_username).first()
-			if mentioned is None:
-				continue
+			return redirect(thread.getViewURL())
 
-			msg = "Mentioned by {} in '{}'".format(current_user.display_name, thread.title)
-			add_notification(mentioned, current_user, NotificationType.THREAD_REPLY,
-							 msg, thread.get_view_url(), thread.package)
+		else:
+			flash("Comment needs to be between 3 and 2000 characters.")
 
-			thread.watchers.append(mentioned)
-
-		msg = "New comment on '{}'".format(thread.title)
-		add_notification(thread.watchers, current_user, NotificationType.THREAD_REPLY, msg, thread.get_view_url(), thread.package)
-
-		if thread.author == get_system_user():
-			approvers = User.query.filter(User.rank >= UserRank.APPROVER).all()
-			add_notification(approvers, current_user, NotificationType.EDITOR_MISC, msg,
-							 thread.get_view_url(), thread.package)
-			post_discord_webhook.delay(current_user.display_name,
-					"Replied to bot messages: {}".format(thread.get_view_url(absolute=True)), True)
-
-		db.session.commit()
-
-		return redirect(thread.get_view_url())
-
-	return render_template("threads/view.html", thread=thread, form=form)
+	return render_template("threads/view.html", thread=thread)
 
 
 class ThreadForm(FlaskForm):
-	title	= StringField(lazy_gettext("Title"), [InputRequired(), Length(3,100)])
-	comment = TextAreaField(lazy_gettext("Comment"), [InputRequired(), Length(10, 2000)])
-	private = BooleanField(lazy_gettext("Private"))
-	btn_submit  = SubmitField(lazy_gettext("Open Thread"))
+	title	= StringField("Title", [InputRequired(), Length(3,100)])
+	comment = TextAreaField("Comment", [InputRequired(), Length(10, 2000)])
+	private = BooleanField("Private")
+	submit  = SubmitField("Open Thread")
 
 
 @bp.route("/threads/new/", methods=["GET", "POST"])
@@ -293,33 +264,33 @@ def new():
 	if "pid" in request.args:
 		package = Package.query.get(int(request.args.get("pid")))
 		if package is None:
-			abort(404)
+			flash("Unable to find that package!", "danger")
 
-	def_is_private = request.args.get("private") or False
-	if package is None and not current_user.rank.at_least(UserRank.APPROVER):
-		abort(404)
+	# Don't allow making orphan threads on approved packages for now
+	if package is None:
+		abort(403)
 
-	is_review_thread = package and not package.approved
-	allow_private_change = not is_review_thread
-	if is_review_thread:
+	def_is_private   = request.args.get("private") or False
+	if package is None:
 		def_is_private = True
+	allow_change     = package and package.approved
+	is_review_thread = package and not package.approved
 
 	# Check that user can make the thread
-	if package and not package.check_perm(current_user, Permission.CREATE_THREAD):
-		flash(gettext("Unable to create thread!"), "danger")
+	if not package.checkPerm(current_user, Permission.CREATE_THREAD):
+		flash("Unable to create thread!", "danger")
 		return redirect(url_for("homepage.home"))
 
 	# Only allow creating one thread when not approved
 	elif is_review_thread and package.review_thread is not None:
-		# Redirect submit to `view` page, which checks for `title` in the form data and so won't commit the reply
-		flash(gettext("An approval thread already exists! Consider replying there instead"), "danger")
-		return redirect(package.review_thread.get_view_url(), code=307)
+		flash("A review thread already exists!", "danger")
+		return redirect(package.review_thread.getViewURL())
 
-	elif not current_user.can_open_thread_ratelimit():
-		flash(gettext("Please wait before opening another thread"), "danger")
+	elif not current_user.canOpenThreadRL():
+		flash("Please wait before opening another thread", "danger")
 
 		if package:
-			return redirect(package.get_url("packages.view"))
+			return redirect(package.getDetailsURL())
 		else:
 			return redirect(url_for("homepage.home"))
 
@@ -330,78 +301,44 @@ def new():
 
 	# Validate and submit
 	elif form.validate_on_submit():
-		if has_blocked_domains(form.comment.data, current_user.username, f"new thread"):
-			flash(gettext("Linking to blocked sites is not allowed"), "danger")
-		else:
-			thread = Thread()
-			thread.author  = current_user
-			thread.title   = form.title.data
-			thread.private = form.private.data if allow_private_change else def_is_private
-			thread.package = package
-			db.session.add(thread)
+		thread = Thread()
+		thread.author  = current_user
+		thread.title   = form.title.data
+		thread.private = form.private.data if allow_change else def_is_private
+		thread.package = package
+		db.session.add(thread)
 
-			thread.watchers.append(current_user)
-			if package and package.author != current_user:
-				thread.watchers.append(package.author)
+		thread.watchers.append(current_user)
+		if package is not None and package.author != current_user:
+			thread.watchers.append(package.author)
 
-			reply = ThreadReply()
-			reply.thread  = thread
-			reply.author  = current_user
-			reply.comment = form.comment.data
-			db.session.add(reply)
+		reply = ThreadReply()
+		reply.thread  = thread
+		reply.author  = current_user
+		reply.comment = form.comment.data
+		db.session.add(reply)
 
-			thread.replies.append(reply)
+		thread.replies.append(reply)
 
-			db.session.commit()
+		db.session.commit()
 
-			if is_review_thread:
-				package.review_thread = thread
+		if is_review_thread:
+			package.review_thread = thread
 
-			for mentioned_username in get_user_mentions(render_markdown(form.comment.data)):
-				mentioned = User.query.filter_by(username=mentioned_username).first()
-				if mentioned is None:
-					continue
-
-				msg = "Mentioned by {} in new thread '{}'".format(current_user.display_name, thread.title)
-				add_notification(mentioned, current_user, NotificationType.NEW_THREAD,
-								 msg, thread.get_view_url(), thread.package)
-
-				thread.watchers.append(mentioned)
-
-			notif_msg = "New thread '{}'".format(thread.title)
-			if package is not None:
-				add_notification(package.maintainers, current_user, NotificationType.NEW_THREAD, notif_msg, thread.get_view_url(), package)
-
-			approvers = User.query.filter(User.rank >= UserRank.APPROVER).all()
-			add_notification(approvers, current_user, NotificationType.EDITOR_MISC, notif_msg, thread.get_view_url(), package)
-
-			if is_review_thread:
-				post_discord_webhook.delay(current_user.display_name,
-						"Opened approval thread: {}".format(thread.get_view_url(absolute=True)), True)
-
-			db.session.commit()
-
-			return redirect(thread.get_view_url())
-
-	return render_template("threads/new.html", form=form, allow_private_change=allow_private_change, package=package)
+			if package.state == PackageState.READY_FOR_REVIEW and current_user not in package.maintainers:
+				package.state = PackageState.CHANGES_NEEDED
 
 
-@bp.route("/users/<username>/comments/")
-def user_comments(username):
-	user = User.query.filter_by(username=username).first()
-	if user is None:
-		abort(404)
+		notif_msg = "New thread '{}'".format(thread.title)
+		if package is not None:
+			addNotification(package.maintainers, current_user, NotificationType.NEW_THREAD, notif_msg, thread.getViewURL(), package)
 
-	page = get_int_or_abort(request.args.get("page"), 1)
-	num = min(40, get_int_or_abort(request.args.get("n"), 40))
+		editors = User.query.filter(User.rank >= UserRank.EDITOR).all()
+		addNotification(editors, current_user, NotificationType.EDITOR_MISC, notif_msg, thread.getViewURL(), package)
 
-	# Filter replies the current user can see
-	query = ThreadReply.query.options(selectinload(ThreadReply.thread)).filter_by(author=user)
-	only_public = False
-	if current_user != user and not (current_user.is_authenticated and current_user.rank.at_least(UserRank.APPROVER)):
-		query = query.filter(ThreadReply.thread.has(private=False))
-		only_public = True
+		db.session.commit()
 
-	pagination = query.order_by(db.desc(ThreadReply.created_at)).paginate(page=page, per_page=num)
+		return redirect(thread.getViewURL())
 
-	return render_template("threads/user_comments.html", user=user, pagination=pagination, only_public=only_public)
+
+	return render_template("threads/new.html", form=form, allow_private_change=allow_change, package=package)

app/blueprints/thumbnails/__init__.py

@@ -22,7 +22,7 @@ bp = Blueprint("thumbnails", __name__)
 import os
 from PIL import Image
 
-ALLOWED_RESOLUTIONS=[(100,67), (270,180), (350,233), (1100,520)]
+ALLOWED_RESOLUTIONS=[(100,67), (270,180), (350,233)]
 
 def mkdir(path):
 	assert path != "" and path is not None
@@ -68,6 +68,7 @@ def resize_and_crop(img_path, modified_path, size):
 def make_thumbnail(img, level):
 	if level > len(ALLOWED_RESOLUTIONS) or level <= 0:
 		abort(403)
+
 	w, h = ALLOWED_RESOLUTIONS[level - 1]
 
 	upload_dir = current_app.config["UPLOAD_DIR"]

app/blueprints/todo/__init__.py

@@ -14,9 +14,234 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+from celery import uuid
+from flask import *
+from flask_login import current_user, login_required
+from sqlalchemy import or_
 
-from flask import Blueprint
+from app.models import *
+from app.querybuilder import QueryBuilder
+from app.utils import get_int_or_abort, addNotification, addAuditLog, isYes
+from app.tasks.importtasks import makeVCSRelease
 
 bp = Blueprint("todo", __name__)
 
-from . import editor, user
+@bp.route("/todo/", methods=["GET", "POST"])
+@login_required
+def view_editor():
+	canApproveNew = Permission.APPROVE_NEW.check(current_user)
+	canApproveRel = Permission.APPROVE_RELEASE.check(current_user)
+	canApproveScn = Permission.APPROVE_SCREENSHOT.check(current_user)
+
+	packages = None
+	wip_packages = None
+	if canApproveNew:
+		packages = Package.query.filter_by(state=PackageState.READY_FOR_REVIEW) \
+			.order_by(db.desc(Package.created_at)).all()
+		wip_packages = Package.query.filter(or_(Package.state==PackageState.WIP, Package.state==PackageState.CHANGES_NEEDED)) \
+			.order_by(db.desc(Package.created_at)).all()
+
+	releases = None
+	if canApproveRel:
+		releases = PackageRelease.query.filter_by(approved=False).all()
+
+	screenshots = None
+	if canApproveScn:
+		screenshots = PackageScreenshot.query.filter_by(approved=False).all()
+
+	if not canApproveNew and not canApproveRel and not canApproveScn:
+		abort(403)
+
+	if request.method == "POST":
+		if request.form["action"] == "screenshots_approve_all":
+			if not canApproveScn:
+				abort(403)
+
+			PackageScreenshot.query.update({ "approved": True })
+			db.session.commit()
+			return redirect(url_for("todo.view_editor"))
+		else:
+			abort(400)
+
+	total_packages = Package.query.filter_by(state=PackageState.APPROVED).count()
+	total_to_tag = Package.query.filter_by(state=PackageState.APPROVED, tags=None).count()
+
+	unfulfilled_meta_packages = MetaPackage.query \
+			.filter(~ MetaPackage.packages.any(state=PackageState.APPROVED)) \
+			.filter(MetaPackage.dependencies.any(optional=False)) \
+			.order_by(db.asc(MetaPackage.name)).count()
+
+	return render_template("todo/editor.html", current_tab="editor",
+			packages=packages, wip_packages=wip_packages, releases=releases, screenshots=screenshots,
+			canApproveNew=canApproveNew, canApproveRel=canApproveRel, canApproveScn=canApproveScn,
+			total_packages=total_packages, total_to_tag=total_to_tag,
+			unfulfilled_meta_packages=unfulfilled_meta_packages)
+
+
+@bp.route("/todo/topics/")
+@login_required
+def topics():
+	qb    = QueryBuilder(request.args)
+	qb.setSortIfNone("date")
+	query = qb.buildTopicQuery()
+
+	tmp_q = ForumTopic.query
+	if not qb.show_discarded:
+		tmp_q = tmp_q.filter_by(discarded=False)
+	total = tmp_q.count()
+	topic_count = query.count()
+
+	page  = get_int_or_abort(request.args.get("page"), 1)
+	num   = get_int_or_abort(request.args.get("n"), 100)
+	if num > 100 and not current_user.rank.atLeast(UserRank.EDITOR):
+		num = 100
+
+	query = query.paginate(page, num, True)
+	next_url = url_for("todo.topics", page=query.next_num, query=qb.search,
+			show_discarded=qb.show_discarded, n=num, sort=qb.order_by) \
+			if query.has_next else None
+	prev_url = url_for("todo.topics", page=query.prev_num, query=qb.search,
+			show_discarded=qb.show_discarded, n=num, sort=qb.order_by) \
+			if query.has_prev else None
+
+	return render_template("todo/topics.html", current_tab="topics", topics=query.items, total=total,
+			topic_count=topic_count, query=qb.search, show_discarded=qb.show_discarded,
+			next_url=next_url, prev_url=prev_url, page=page, page_max=query.pages,
+			n=num, sort_by=qb.order_by)
+
+
+@bp.route("/todo/tags/")
+@login_required
+def tags():
+	qb    = QueryBuilder(request.args)
+	qb.setSortIfNone("score", "desc")
+	query = qb.buildPackageQuery()
+
+	tags = Tag.query.order_by(db.asc(Tag.title)).all()
+
+	return render_template("todo/tags.html", current_tab="tags", packages=query.all(), tags=tags)
+
+
+@bp.route("/user/tags/")
+def tags_user():
+	return redirect(url_for('todo.tags', author=current_user.username))
+
+
+@bp.route("/todo/metapackages/")
+@login_required
+def metapackages():
+	mpackages = MetaPackage.query \
+			.filter(~ MetaPackage.packages.any(state=PackageState.APPROVED)) \
+			.filter(MetaPackage.dependencies.any(optional=False)) \
+			.order_by(db.asc(MetaPackage.name)).all()
+
+	return render_template("todo/metapackages.html", mpackages=mpackages)
+
+
+@bp.route("/user/todo/")
+@bp.route("/users/<username>/todo/")
+@login_required
+def view_user(username=None):
+	if username is None:
+		return redirect(url_for("todo.view_user", username=current_user.username))
+
+	user : User = User.query.filter_by(username=username).first()
+	if not user:
+		abort(404)
+
+	if current_user != user and not current_user.rank.atLeast(UserRank.EDITOR):
+		abort(403)
+
+	unapproved_packages = user.packages \
+		.filter(or_(Package.state == PackageState.WIP,
+			Package.state == PackageState.CHANGES_NEEDED)) \
+		.order_by(db.asc(Package.created_at)).all()
+
+	outdated_packages = user.maintained_packages \
+			.filter(Package.state != PackageState.DELETED,
+					Package.update_config.has(PackageUpdateConfig.outdated_at.isnot(None))) \
+			.order_by(db.asc(Package.title)).all()
+
+	topics_to_add = ForumTopic.query \
+			.filter_by(author_id=user.id) \
+			.filter(~ db.exists().where(Package.forums == ForumTopic.topic_id)) \
+			.order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \
+			.all()
+
+	needs_tags = user.maintained_packages \
+		.filter(Package.state != PackageState.DELETED) \
+		.filter_by(tags=None).order_by(db.asc(Package.title)).all()
+
+	return render_template("todo/user.html", current_tab="user", user=user,
+			unapproved_packages=unapproved_packages, outdated_packages=outdated_packages,
+			needs_tags=needs_tags, topics_to_add=topics_to_add)
+
+
+@bp.route("/users/<username>/update-configs/apply-all/", methods=["POST"])
+@login_required
+def apply_all_updates(username):
+	user: User = User.query.filter_by(username=username).first()
+	if not user:
+		abort(404)
+
+	if current_user != user and not current_user.rank.atLeast(UserRank.EDITOR):
+		abort(403)
+
+	outdated_packages = user.maintained_packages \
+		.filter(Package.state != PackageState.DELETED,
+			Package.update_config.has(PackageUpdateConfig.outdated_at.isnot(None))) \
+		.order_by(db.asc(Package.title)).all()
+
+	for package in outdated_packages:
+		if not package.checkPerm(current_user, Permission.MAKE_RELEASE):
+			continue
+
+		if package.releases.filter(or_(PackageRelease.task_id.isnot(None),
+				PackageRelease.commit_hash==package.update_config.last_commit)).count() > 0:
+			continue
+
+		title = package.update_config.get_title()
+		ref = package.update_config.get_ref()
+
+		rel = PackageRelease()
+		rel.package = package
+		rel.title = title
+		rel.url = ""
+		rel.task_id = uuid()
+		db.session.add(rel)
+		db.session.commit()
+
+		makeVCSRelease.apply_async((rel.id, ref),
+				task_id=rel.task_id)
+
+		msg = "Created release {} (Applied all Git Update Detection)".format(rel.title)
+		addNotification(package.maintainers, current_user, NotificationType.PACKAGE_EDIT, msg,
+				rel.getEditURL(), package)
+		addAuditLog(AuditSeverity.NORMAL, current_user, msg, package.getDetailsURL(), package)
+		db.session.commit()
+
+	return redirect(url_for("todo.view_user", username=username))
+
+
+@bp.route("/todo/outdated/")
+@login_required
+def outdated():
+	is_mtm_only = isYes(request.args.get("mtm"))
+
+	query = db.session.query(Package).select_from(PackageUpdateConfig) \
+			.filter(PackageUpdateConfig.outdated_at.isnot(None)) \
+			.join(PackageUpdateConfig.package) \
+			.filter(Package.state == PackageState.APPROVED)
+
+	if is_mtm_only:
+		query = query.filter(Package.repo.ilike("%github.com/minetest-mods/%"))
+
+	sort_by = request.args.get("sort")
+	if sort_by == "date":
+		query = query.order_by(db.desc(PackageUpdateConfig.outdated_at))
+	else:
+		sort_by = "score"
+		query = query.order_by(db.desc(Package.score))
+
+	return render_template("todo/outdated.html", current_tab="outdated",
+			outdated_packages=query.all(), sort_by=sort_by, is_mtm_only=is_mtm_only)

app/blueprints/todo/editor.py

@@ -1,222 +0,0 @@
-# ContentDB
-# Copyright (C) 2018-23 rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-
-from flask import redirect, url_for, abort, render_template, request
-from flask_login import current_user, login_required
-from sqlalchemy import or_
-
-from app.models import Package, PackageState, PackageScreenshot, PackageUpdateConfig, ForumTopic, db, \
-	PackageRelease, Permission, UserRank, License, MetaPackage, Dependency, AuditLogEntry, Tag, MinetestRelease
-from app.querybuilder import QueryBuilder
-from app.utils import get_int_or_abort, is_yes
-from . import bp
-
-
-@bp.route("/todo/", methods=["GET", "POST"])
-@login_required
-def view_editor():
-	can_approve_new = Permission.APPROVE_NEW.check(current_user)
-	can_approve_rel = Permission.APPROVE_RELEASE.check(current_user)
-	can_approve_scn = Permission.APPROVE_SCREENSHOT.check(current_user)
-
-	packages = None
-	wip_packages = None
-	if can_approve_new:
-		packages = Package.query.filter_by(state=PackageState.READY_FOR_REVIEW) \
-			.order_by(db.desc(Package.created_at)).all()
-		wip_packages = Package.query \
-			.filter(or_(Package.state == PackageState.WIP, Package.state == PackageState.CHANGES_NEEDED)) \
-			.order_by(db.desc(Package.created_at)).all()
-
-	releases = None
-	if can_approve_rel:
-		releases = PackageRelease.query.filter_by(approved=False).all()
-
-	screenshots = None
-	if can_approve_scn:
-		screenshots = PackageScreenshot.query.filter_by(approved=False).all()
-
-	if not can_approve_new and not can_approve_rel and not can_approve_scn:
-		abort(403)
-
-	if request.method == "POST":
-		if request.form["action"] == "screenshots_approve_all":
-			if not can_approve_scn:
-				abort(403)
-
-			PackageScreenshot.query.update({"approved": True})
-			db.session.commit()
-			return redirect(url_for("todo.view_editor"))
-		else:
-			abort(400)
-
-	license_needed = Package.query \
-		.filter(Package.state.in_([PackageState.READY_FOR_REVIEW, PackageState.APPROVED])) \
-		.filter(or_(Package.license.has(License.name.like("Other %")),
-			Package.media_license.has(License.name.like("Other %")))) \
-		.all()
-
-	total_packages = Package.query.filter_by(state=PackageState.APPROVED).count()
-	total_to_tag = Package.query.filter_by(state=PackageState.APPROVED, tags=None).count()
-
-	unfulfilled_meta_packages = MetaPackage.query \
-		.filter(~ MetaPackage.packages.any(state=PackageState.APPROVED)) \
-		.filter(MetaPackage.dependencies.any(Dependency.depender.has(state=PackageState.APPROVED), optional=False)) \
-		.order_by(db.asc(MetaPackage.name)).count()
-
-	audit_log = AuditLogEntry.query \
-		.filter(AuditLogEntry.package.has()) \
-		.order_by(db.desc(AuditLogEntry.created_at)) \
-		.limit(20).all()
-
-	return render_template("todo/editor.html", current_tab="editor",
-			packages=packages, wip_packages=wip_packages, releases=releases, screenshots=screenshots,
-			can_approve_new=can_approve_new, can_approve_rel=can_approve_rel, can_approve_scn=can_approve_scn,
-			license_needed=license_needed, total_packages=total_packages, total_to_tag=total_to_tag,
-			unfulfilled_meta_packages=unfulfilled_meta_packages, audit_log=audit_log)
-
-
-@bp.route("/todo/topics/")
-@login_required
-def topics():
-	qb = QueryBuilder(request.args)
-	qb.set_sort_if_none("date")
-	query = qb.build_topic_query()
-
-	tmp_q = ForumTopic.query
-	if not qb.show_discarded:
-		tmp_q = tmp_q.filter_by(discarded=False)
-	total = tmp_q.count()
-	topic_count = query.count()
-
-	page = get_int_or_abort(request.args.get("page"), 1)
-	num = get_int_or_abort(request.args.get("n"), 100)
-	if num > 100 and not current_user.rank.at_least(UserRank.APPROVER):
-		num = 100
-
-	query = query.paginate(page=page, per_page=num)
-	next_url = url_for("todo.topics", page=query.next_num, query=qb.search,
-		show_discarded=qb.show_discarded, n=num, sort=qb.order_by) \
-		if query.has_next else None
-	prev_url = url_for("todo.topics", page=query.prev_num, query=qb.search,
-		show_discarded=qb.show_discarded, n=num, sort=qb.order_by) \
-		if query.has_prev else None
-
-	return render_template("todo/topics.html", current_tab="topics", topics=query.items, total=total,
-		topic_count=topic_count, query=qb.search, show_discarded=qb.show_discarded,
-		next_url=next_url, prev_url=prev_url, page=page, page_max=query.pages,
-		n=num, sort_by=qb.order_by)
-
-
-@bp.route("/todo/tags/")
-@login_required
-def tags():
-	qb    = QueryBuilder(request.args)
-	qb.set_sort_if_none("score", "desc")
-	query = qb.build_package_query()
-
-	only_no_tags = is_yes(request.args.get("no_tags"))
-	if only_no_tags:
-		query = query.filter(Package.tags == None)
-
-	tags = Tag.query.order_by(db.asc(Tag.title)).all()
-
-	return render_template("todo/tags.html", current_tab="tags", packages=query.all(),
-			tags=tags, only_no_tags=only_no_tags)
-
-
-@bp.route("/todo/modnames/")
-@login_required
-def modnames():
-	mnames = MetaPackage.query \
-			.filter(~ MetaPackage.packages.any(state=PackageState.APPROVED)) \
-			.filter(MetaPackage.dependencies.any(Dependency.depender.has(state=PackageState.APPROVED), optional=False)) \
-			.order_by(db.asc(MetaPackage.name)).all()
-
-	return render_template("todo/modnames.html", modnames=mnames)
-
-
-@bp.route("/todo/outdated/")
-@login_required
-def outdated():
-	is_mtm_only = is_yes(request.args.get("mtm"))
-
-	query = db.session.query(Package).select_from(PackageUpdateConfig) \
-			.filter(PackageUpdateConfig.outdated_at.isnot(None)) \
-			.join(PackageUpdateConfig.package) \
-			.filter(Package.state == PackageState.APPROVED)
-
-	if is_mtm_only:
-		query = query.filter(Package.repo.ilike("%github.com/minetest-mods/%"))
-
-	sort_by = request.args.get("sort")
-	if sort_by == "date":
-		query = query.order_by(db.desc(PackageUpdateConfig.outdated_at))
-	else:
-		sort_by = "score"
-		query = query.order_by(db.desc(Package.score))
-
-	return render_template("todo/outdated.html", current_tab="outdated",
-			outdated_packages=query.all(), sort_by=sort_by, is_mtm_only=is_mtm_only)
-
-
-@bp.route("/todo/screenshots/")
-@login_required
-def screenshots():
-	is_mtm_only = is_yes(request.args.get("mtm"))
-
-	query = db.session.query(Package) \
-			.filter(~Package.screenshots.any()) \
-			.filter(Package.state == PackageState.APPROVED)
-
-	if is_mtm_only:
-		query = query.filter(Package.repo.ilike("%github.com/minetest-mods/%"))
-
-	sort_by = request.args.get("sort")
-	if sort_by == "date":
-		query = query.order_by(db.desc(Package.approved_at))
-	else:
-		sort_by = "score"
-		query = query.order_by(db.desc(Package.score))
-
-	return render_template("todo/screenshots.html", current_tab="screenshots",
-			packages=query.all(), sort_by=sort_by, is_mtm_only=is_mtm_only)
-
-
-@bp.route("/todo/mtver_support/")
-@login_required
-def mtver_support():
-	is_mtm_only = is_yes(request.args.get("mtm"))
-
-	current_stable = MinetestRelease.query.filter(~MinetestRelease.name.like("%-dev")).order_by(db.desc(MinetestRelease.id)).first()
-
-	query = db.session.query(Package) \
-			.filter(~Package.releases.any(or_(PackageRelease.max_rel==None, PackageRelease.max_rel == current_stable))) \
-			.filter(Package.state == PackageState.APPROVED)
-
-	if is_mtm_only:
-		query = query.filter(Package.repo.ilike("%github.com/minetest-mods/%"))
-
-	sort_by = request.args.get("sort")
-	if sort_by == "date":
-		query = query.order_by(db.desc(Package.approved_at))
-	else:
-		sort_by = "score"
-		query = query.order_by(db.desc(Package.score))
-
-	return render_template("todo/mtver_support.html", current_tab="screenshots",
-			packages=query.all(), sort_by=sort_by, is_mtm_only=is_mtm_only, current_stable=current_stable)

app/blueprints/todo/user.py

@@ -1,193 +0,0 @@
-# ContentDB
-# Copyright (C) 2018-23 rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-from celery import uuid
-from flask import redirect, url_for, abort, render_template, flash
-from flask_babel import gettext
-from flask_login import current_user, login_required
-from sqlalchemy import or_, and_
-
-from app.models import User, Package, PackageState, PackageScreenshot, PackageUpdateConfig, ForumTopic, db, \
-	PackageRelease, Permission, NotificationType, AuditSeverity, UserRank, PackageType
-from app.tasks.importtasks import make_vcs_release
-from app.utils import add_notification, add_audit_log
-from . import bp
-
-
-@bp.route("/user/tags/")
-def tags_user():
-	return redirect(url_for('todo.tags', author=current_user.username))
-
-
-@bp.route("/user/todo/")
-@bp.route("/users/<username>/todo/")
-@login_required
-def view_user(username=None):
-	if username is None:
-		return redirect(url_for("todo.view_user", username=current_user.username))
-
-	user: User = User.query.filter_by(username=username).first()
-	if not user:
-		abort(404)
-
-	if current_user != user and not current_user.rank.at_least(UserRank.APPROVER):
-		abort(403)
-
-	unapproved_packages = user.packages \
-			.filter(or_(Package.state == PackageState.WIP,
-				Package.state == PackageState.CHANGES_NEEDED)) \
-			.order_by(db.asc(Package.created_at)).all()
-
-	outdated_packages = user.maintained_packages \
-			.filter(Package.state != PackageState.DELETED,
-					Package.update_config.has(PackageUpdateConfig.outdated_at.isnot(None))) \
-			.order_by(db.asc(Package.title)).all()
-
-	missing_game_support = user.maintained_packages.filter(
-			Package.state != PackageState.DELETED,
-			Package.type.in_([PackageType.MOD, PackageType.TXP]),
-			~Package.supported_games.any(),
-			Package.supports_all_games == False) \
-			.order_by(db.asc(Package.title)).all()
-
-	packages_with_no_screenshots = user.maintained_packages.filter(
-			~Package.screenshots.any(), Package.state == PackageState.APPROVED).all()
-
-	packages_with_small_screenshots = user.maintained_packages \
-			.filter(Package.state != PackageState.DELETED,
-					Package.screenshots.any(and_(PackageScreenshot.width < PackageScreenshot.SOFT_MIN_SIZE[0],
-					PackageScreenshot.height < PackageScreenshot.SOFT_MIN_SIZE[1]))) \
-			.all()
-
-	topics_to_add = ForumTopic.query \
-			.filter_by(author_id=user.id) \
-			.filter(~ db.exists().where(Package.forums == ForumTopic.topic_id)) \
-			.order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \
-			.all()
-
-	needs_tags = user.maintained_packages \
-		.filter(Package.state != PackageState.DELETED, ~Package.tags.any()) \
-		.order_by(db.asc(Package.title)).all()
-
-	return render_template("todo/user.html", current_tab="user", user=user,
-			unapproved_packages=unapproved_packages, outdated_packages=outdated_packages,
-			missing_game_support=missing_game_support, needs_tags=needs_tags, topics_to_add=topics_to_add,
-			packages_with_no_screenshots=packages_with_no_screenshots,
-			packages_with_small_screenshots=packages_with_small_screenshots,
-			screenshot_min_size=PackageScreenshot.HARD_MIN_SIZE, screenshot_rec_size=PackageScreenshot.SOFT_MIN_SIZE)
-
-
-@bp.route("/users/<username>/update-configs/apply-all/", methods=["POST"])
-@login_required
-def apply_all_updates(username):
-	user: User = User.query.filter_by(username=username).first()
-	if not user:
-		abort(404)
-
-	if current_user != user and not current_user.rank.at_least(UserRank.EDITOR):
-		abort(403)
-
-	outdated_packages = user.maintained_packages \
-		.filter(Package.state != PackageState.DELETED,
-			Package.update_config.has(PackageUpdateConfig.outdated_at.isnot(None))) \
-		.order_by(db.asc(Package.title)).all()
-
-	for package in outdated_packages:
-		if not package.check_perm(current_user, Permission.MAKE_RELEASE):
-			continue
-
-		if package.releases.filter(or_(PackageRelease.task_id.isnot(None),
-				PackageRelease.commit_hash == package.update_config.last_commit)).count() > 0:
-			continue
-
-		title = package.update_config.get_title()
-		ref = package.update_config.get_ref()
-
-		rel = PackageRelease()
-		rel.package = package
-		rel.title = title
-		rel.url = ""
-		rel.task_id = uuid()
-		db.session.add(rel)
-		db.session.commit()
-
-		make_vcs_release.apply_async((rel.id, ref),
-									 task_id=rel.task_id)
-
-		msg = "Created release {} (Applied all Git Update Detection)".format(rel.title)
-		add_notification(package.maintainers, current_user, NotificationType.PACKAGE_EDIT, msg,
-				package.get_url("packages.create_edit"), package)
-		add_audit_log(AuditSeverity.NORMAL, current_user, msg, package.get_url("packages.view"), package)
-		db.session.commit()
-
-	return redirect(url_for("todo.view_user", username=username))
-
-
-@bp.route("/user/game_support/")
-@bp.route("/users/<username>/game_support/")
-@login_required
-def all_game_support(username=None):
-	if username is None:
-		return redirect(url_for("todo.all_game_support", username=current_user.username))
-
-	user: User = User.query.filter_by(username=username).one_or_404()
-	if current_user != user and not current_user.rank.at_least(UserRank.EDITOR):
-		abort(403)
-
-	packages = user.maintained_packages.filter(
-				Package.state != PackageState.DELETED,
-				Package.type.in_([PackageType.MOD, PackageType.TXP])) \
-			.order_by(db.asc(Package.title)).all()
-
-	bulk_support_names = db.session.query(Package.title) \
-		.select_from(Package).filter(
-			Package.maintainers.contains(user),
-			Package.state != PackageState.DELETED,
-			Package.type.in_([PackageType.MOD, PackageType.TXP]),
-			~Package.supported_games.any(),
-			Package.supports_all_games == False) \
-		.order_by(db.asc(Package.title)).all()
-
-	bulk_support_names = ", ".join([x[0] for x in bulk_support_names])
-
-	return render_template("todo/game_support.html", user=user, packages=packages, bulk_support_names=bulk_support_names)
-
-
-@bp.route("/users/<username>/confirm_supports_all_games/", methods=["POST"])
-@login_required
-def confirm_supports_all_games(username=None):
-	user: User = User.query.filter_by(username=username).one_or_404()
-	if current_user != user and not current_user.rank.at_least(UserRank.EDITOR):
-		abort(403)
-
-	packages = user.maintained_packages.filter(
-		Package.state != PackageState.DELETED,
-		Package.type.in_([PackageType.MOD, PackageType.TXP]),
-		~Package.supported_games.any(),
-		Package.supports_all_games == False) \
-		.all()
-
-	for package in packages:
-		package.supports_all_games = True
-		db.session.merge(package)
-
-		add_audit_log(AuditSeverity.NORMAL, current_user, "Enabled 'Supports all games' (bulk)",
-					  package.get_url("packages.game_support"), package)
-
-	db.session.commit()
-
-	flash(gettext("Done"), "success")
-	return redirect(url_for("todo.all_game_support", username=current_user.username))

app/blueprints/users/account.py

@@ -14,68 +14,70 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import datetime
 
-from flask import redirect, abort, render_template, flash, request, url_for
-from flask_babel import gettext, get_locale, lazy_gettext
+from flask import *
 from flask_login import current_user, login_required, logout_user, login_user
 from flask_wtf import FlaskForm
 from sqlalchemy import or_
-from wtforms import StringField, SubmitField, BooleanField, PasswordField, validators
-from wtforms.validators import InputRequired, Length, Regexp, DataRequired, Optional, Email, EqualTo
+from wtforms import *
+from wtforms.validators import *
 
+from app.models import *
 from app.tasks.emails import send_verify_email, send_anon_email, send_unsubscribe_verify, send_user_email
-from app.utils import random_string, make_flask_login_password, is_safe_url, check_password_hash, add_audit_log, \
-	nonempty_or_none, post_login, is_username_valid
+from app.utils import randomString, make_flask_login_password, is_safe_url, check_password_hash, addAuditLog, nonEmptyOrNone
+from passlib.pwd import genphrase
+
 from . import bp
-from app.models import User, AuditSeverity, db, UserRank, PackageAlias, EmailSubscription, UserNotificationPreferences, \
-	UserEmailVerification
 
 
 class LoginForm(FlaskForm):
-	username = StringField(lazy_gettext("Username or email"), [InputRequired()])
-	password = PasswordField(lazy_gettext("Password"), [InputRequired(), Length(6, 100)])
-	remember_me = BooleanField(lazy_gettext("Remember me"), default=True)
-	submit = SubmitField(lazy_gettext("Sign in"))
+	username = StringField("Username or email", [InputRequired()])
+	password = PasswordField("Password", [InputRequired(), Length(6, 100)])
+	remember_me = BooleanField("Remember me", default=True)
+	submit = SubmitField("Sign in")
 
 
 def handle_login(form):
 	def show_safe_err(err):
 		if "@" in username:
-			flash(gettext("Incorrect email or password"), "danger")
+			flash("Incorrect email or password", "danger")
 		else:
 			flash(err, "danger")
 
+
 	username = form.username.data.strip()
 	user = User.query.filter(or_(User.username == username, User.email == username)).first()
 	if user is None:
-		return show_safe_err(gettext(u"User %(username)s does not exist", username=username))
+		return show_safe_err("User {} does not exist".format(username))
 
 	if not check_password_hash(user.password, form.password.data):
-		return show_safe_err(gettext(u"Incorrect password. Did you set one?"))
+		return show_safe_err("Incorrect password. Did you set one?")
 
 	if not user.is_active:
-		flash(gettext("You need to confirm the registration email"), "danger")
+		flash("You need to confirm the registration email", "danger")
 		return
 
-	add_audit_log(AuditSeverity.USER, user, "Logged in using password",
-				  url_for("users.profile", username=user.username))
+	addAuditLog(AuditSeverity.USER, user, "Logged in using password",
+			url_for("users.profile", username=user.username))
 	db.session.commit()
 
-	if not login_user(user, remember=form.remember_me.data):
-		flash(gettext("Login failed"), "danger")
-		return
+	login_user(user, remember=form.remember_me.data)
+	flash("Logged in successfully.", "success")
 
-	return post_login(user, request.args.get("next"))
-
-
-@bp.route("/user/login/", methods=["GET", "POST"])
-def login():
 	next = request.args.get("next")
 	if next and not is_safe_url(next):
 		abort(400)
 
+	return redirect(next or url_for("homepage.home"))
+
+
+@bp.route("/user/login/", methods=["GET", "POST"])
+def login():
 	if current_user.is_authenticated:
+		next = request.args.get("next")
+		if next and not is_safe_url(next):
+			abort(400)
+
 		return redirect(next or url_for("homepage.home"))
 
 	form = LoginForm(request.form)
@@ -87,7 +89,8 @@ def login():
 	if request.method == "GET":
 		form.remember_me.data = True
 
-	return render_template("users/login.html", form=form, next=next)
+
+	return render_template("users/login.html", form=form)
 
 
 @bp.route("/user/logout/", methods=["GET", "POST"])
@@ -97,67 +100,45 @@ def logout():
 
 
 class RegisterForm(FlaskForm):
-	display_name = StringField(lazy_gettext("Display Name"), [Optional(), Length(1, 20)], filters=[nonempty_or_none])
-	username = StringField(lazy_gettext("Username"), [InputRequired(),
-			Regexp("^[a-zA-Z0-9._-]+$", message=lazy_gettext(
-				"Only alphabetic letters (A-Za-z), numbers (0-9), underscores (_), minuses (-), and periods (.) allowed"))])
-	email    = StringField(lazy_gettext("Email"), [InputRequired(), Email()])
-	password = PasswordField(lazy_gettext("Password"), [InputRequired(), Length(12, 100)])
-	question  = StringField(lazy_gettext("What is the result of the above calculation?"), [InputRequired()])
-	agree    = BooleanField(lazy_gettext("I agree"), [DataRequired()])
-	submit   = SubmitField(lazy_gettext("Register"))
+	username = StringField("Username", [InputRequired()])
+	email = StringField("Email", [InputRequired(), Email()])
+	password = PasswordField("Password", [InputRequired(), Length(6, 100)])
+	submit = SubmitField("Register")
 
 
 def handle_register(form):
-	if form.question.data.strip().lower() != "19":
-		flash(gettext("Incorrect captcha answer"), "danger")
-		return
-
-	if not is_username_valid(form.username.data):
-		flash(gettext("Username is invalid"))
-		return
-
 	user_by_name = User.query.filter(or_(
 			User.username == form.username.data,
-			User.username == form.display_name.data,
-			User.display_name == form.display_name.data,
 			User.forums_username == form.username.data,
 			User.github_username == form.username.data)).first()
 	if user_by_name:
 		if user_by_name.rank == UserRank.NOT_JOINED and user_by_name.forums_username:
-			flash(gettext("An account already exists for that username but hasn't been claimed yet."), "danger")
+			flash("An account already exists for that username but hasn't been claimed yet.", "danger")
 			return redirect(url_for("users.claim_forums", username=user_by_name.forums_username))
 		else:
-			flash(gettext("That username/display name is already in use, please choose another."), "danger")
+			flash("That username is already in use, please choose another.", "danger")
 			return
 
-	alias_by_name = PackageAlias.query.filter(or_(
-			PackageAlias.author==form.username.data,
-			PackageAlias.author==form.display_name.data)).first()
-	if alias_by_name:
-		flash(gettext("That username/display name is already in use, please choose another."), "danger")
-		return
 
 	user_by_email = User.query.filter_by(email=form.email.data).first()
 	if user_by_email:
-		send_anon_email.delay(form.email.data, get_locale().language, gettext("Email already in use"),
-			gettext("We were unable to create the account as the email is already in use by %(display_name)s. Try a different email address.",
-					display_name=user_by_email.display_name))
-		return redirect(url_for("users.email_sent"))
+		send_anon_email.delay(form.email.data, "Email already in use",
+				"We were unable to create the account as the email is already in use by {}. Try a different email address.".format(
+						user_by_email.display_name))
+		flash("Check your email address to verify your account", "success")
+		return redirect(url_for("homepage.home"))
 	elif EmailSubscription.query.filter_by(email=form.email.data, blacklisted=True).count() > 0:
-		flash(gettext("That email address has been unsubscribed/blacklisted, and cannot be used"), "danger")
+		flash("That email address has been unsubscribed/blacklisted, and cannot be used", "danger")
 		return
 
 	user = User(form.username.data, False, form.email.data, make_flask_login_password(form.password.data))
 	user.notification_preferences = UserNotificationPreferences(user)
-	if form.display_name.data:
-		user.display_name = form.display_name.data
 	db.session.add(user)
 
-	add_audit_log(AuditSeverity.USER, user, "Registered with email, display name=" + user.display_name,
-				  url_for("users.profile", username=user.username))
+	addAuditLog(AuditSeverity.USER, user, "Registered with email",
+			url_for("users.profile", username=user.username))
 
-	token = random_string(32)
+	token = randomString(32)
 
 	ver = UserEmailVerification()
 	ver.user = user
@@ -166,9 +147,10 @@ def handle_register(form):
 	db.session.add(ver)
 	db.session.commit()
 
-	send_verify_email.delay(form.email.data, token, get_locale().language)
+	send_verify_email.delay(form.email.data, token)
 
-	return redirect(url_for("users.email_sent"))
+	flash("Check your email address to verify your account", "success")
+	return redirect(url_for("homepage.home"))
 
 
 @bp.route("/user/register/", methods=["GET", "POST"])
@@ -179,13 +161,12 @@ def register():
 		if ret:
 			return ret
 
-	return render_template("users/register.html", form=form)
+	return render_template("users/register.html", form=form, suggested_password=genphrase(entropy=52, wordset="bip39"))
 
 
 class ForgotPasswordForm(FlaskForm):
-	email = StringField(lazy_gettext("Email"), [InputRequired(), Email()])
-	submit = SubmitField(lazy_gettext("Reset Password"))
-
+	email = StringField("Email", [InputRequired(), Email()])
+	submit = SubmitField("Reset Password")
 
 @bp.route("/user/forgot-password/", methods=["GET", "POST"])
 def forgot_password():
@@ -194,10 +175,10 @@ def forgot_password():
 		email = form.email.data
 		user = User.query.filter_by(email=email).first()
 		if user:
-			token = random_string(32)
+			token = randomString(32)
 
-			add_audit_log(AuditSeverity.USER, user, "(Anonymous) requested a password reset",
-						  url_for("users.profile", username=user.username), None)
+			addAuditLog(AuditSeverity.USER, user, "(Anonymous) requested a password reset",
+					url_for("users.profile", username=user.username), None)
 
 			ver = UserEmailVerification()
 			ver.user = user
@@ -207,73 +188,65 @@ def forgot_password():
 			db.session.add(ver)
 			db.session.commit()
 
-			send_verify_email.delay(form.email.data, token, get_locale().language)
+			send_verify_email.delay(form.email.data, token)
 		else:
-			html = render_template("emails/unable_to_find_account.html")
-			send_anon_email.delay(email, get_locale().language, gettext("Unable to find account"),
-					html, html)
+			send_anon_email.delay(email, "Unable to find account", """
+					<p>
+						We were unable to perform the password reset as we could not find an account
+						associated with this email.
+					</p>
+					<p>
+						If you weren't expecting to receive this email, then you can safely ignore it.
+					</p>
+			""")
 
-		return redirect(url_for("users.email_sent"))
+		flash("Check your email address to continue the reset", "success")
+		return redirect(url_for("homepage.home"))
 
 	return render_template("users/forgot_password.html", form=form)
 
 
 class SetPasswordForm(FlaskForm):
-	email = StringField(lazy_gettext("Email"), [Optional(), Email()])
-	password = PasswordField(lazy_gettext("New password"), [InputRequired(), Length(12, 100)])
-	password2 = PasswordField(lazy_gettext("Verify password"), [InputRequired(), Length(12, 100),
-			EqualTo('password', message=lazy_gettext('Passwords must match'))])
-	submit = SubmitField(lazy_gettext("Save"))
-
+	email = StringField("Email", [Optional(), Email()])
+	password = PasswordField("New password", [InputRequired(), Length(8, 100)])
+	password2 = PasswordField("Verify password", [InputRequired(), Length(8, 100), validators.EqualTo('password', message='Passwords must match')])
+	submit = SubmitField("Save")
 
 class ChangePasswordForm(FlaskForm):
-	old_password = PasswordField(lazy_gettext("Old password"), [InputRequired(), Length(6, 100)])
-	password = PasswordField(lazy_gettext("New password"), [InputRequired(), Length(12, 100)])
-	password2 = PasswordField(lazy_gettext("Verify password"), [InputRequired(), Length(12, 100),
-			validators.EqualTo('password', message=lazy_gettext('Passwords must match'))])
-	submit = SubmitField(lazy_gettext("Save"))
+	old_password = PasswordField("Old password", [InputRequired(), Length(8, 100)])
+	password = PasswordField("New password", [InputRequired(), Length(8, 100)])
+	password2 = PasswordField("Verify password", [InputRequired(), Length(8, 100), validators.EqualTo('password', message='Passwords must match')])
+	submit = SubmitField("Save")
 
 
 def handle_set_password(form):
 	one = form.password.data
 	two = form.password2.data
 	if one != two:
-		flash(gettext("Passwords do not match"), "danger")
+		flash("Passwords do not much", "danger")
 		return
 
-	add_audit_log(AuditSeverity.USER, current_user, "Changed their password", url_for("users.profile", username=current_user.username))
+	addAuditLog(AuditSeverity.USER, current_user, "Changed their password", url_for("users.profile", username=current_user.username))
 
 	current_user.password = make_flask_login_password(form.password.data)
 
 	if hasattr(form, "email"):
-		new_email = nonempty_or_none(form.email.data)
-		if new_email and new_email != current_user.email:
+		newEmail = nonEmptyOrNone(form.email.data)
+		if newEmail and newEmail != current_user.email:
 			if EmailSubscription.query.filter_by(email=form.email.data, blacklisted=True).count() > 0:
-				flash(gettext(u"That email address has been unsubscribed/blacklisted, and cannot be used"), "danger")
+				flash("That email address has been unsubscribed/blacklisted, and cannot be used", "danger")
 				return
 
-			user_by_email = User.query.filter_by(email=form.email.data).first()
-			if user_by_email:
-				send_anon_email.delay(form.email.data, get_locale().language, gettext("Email already in use"),
-					gettext(u"We were unable to create the account as the email is already in use by %(display_name)s. Try a different email address.",
-							display_name=user_by_email.display_name))
-			else:
-				token = random_string(32)
+			token = randomString(32)
 
-				ver = UserEmailVerification()
-				ver.user = current_user
-				ver.token = token
-				ver.email = new_email
-				db.session.add(ver)
-				db.session.commit()
-
-				send_verify_email.delay(form.email.data, token, get_locale().language)
-
-			flash(gettext("Your password has been changed successfully."), "success")
-			return redirect(url_for("users.email_sent"))
+			ver = UserEmailVerification()
+			ver.user = current_user
+			ver.token = token
+			ver.email = newEmail
+			db.session.add(ver)
 
 	db.session.commit()
-	flash(gettext("Your password has been changed successfully."), "success")
+	flash("Your password has been changed successfully.", "success")
 	return redirect(url_for("homepage.home"))
 
 
@@ -288,9 +261,10 @@ def change_password():
 			if ret:
 				return ret
 		else:
-			flash(gettext("Old password is incorrect"), "danger")
+			flash("Old password is incorrect", "danger")
 
-	return render_template("users/change_set_password.html", form=form)
+	return render_template("users/change_set_password.html", form=form,
+			suggested_password=genphrase(entropy=52, wordset="bip39"))
 
 
 @bp.route("/user/set-password/", methods=["GET", "POST"])
@@ -308,44 +282,36 @@ def set_password():
 		if ret:
 			return ret
 
-	return render_template("users/change_set_password.html", form=form)
+	return render_template("users/change_set_password.html", form=form, optional=request.args.get("optional"),
+			suggested_password=genphrase(entropy=52, wordset="bip39"))
 
 
 @bp.route("/user/verify/")
 def verify_email():
 	token = request.args.get("token")
-	ver: UserEmailVerification = UserEmailVerification.query.filter_by(token=token).first()
+	ver : UserEmailVerification = UserEmailVerification.query.filter_by(token=token).first()
 	if ver is None:
-		flash(gettext("Unknown verification token!"), "danger")
-		return redirect(url_for("homepage.home"))
-
-	delta = (datetime.datetime.now() - ver.created_at)
-	delta: datetime.timedelta
-	if delta.total_seconds() > 12*60*60:
-		flash(gettext("Token has expired"), "danger")
-		db.session.delete(ver)
-		db.session.commit()
+		flash("Unknown verification token!", "danger")
 		return redirect(url_for("homepage.home"))
 
 	user = ver.user
 
-	add_audit_log(AuditSeverity.USER, user, "Confirmed their email",
-				  url_for("users.profile", username=user.username))
+	addAuditLog(AuditSeverity.USER, user, "Confirmed their email",
+			url_for("users.profile", username=user.username))
 
 	was_activating = not user.is_active
 
 	if ver.email and user.email != ver.email:
 		if User.query.filter_by(email=ver.email).count() > 0:
-			flash(gettext("Another user is already using that email"), "danger")
+			flash("Another user is already using that email", "danger")
 			return redirect(url_for("homepage.home"))
 
-		flash(gettext("Confirmed email change"), "success")
+		flash("Confirmed email change", "success")
 
 		if user.email:
 			send_user_email.delay(user.email,
-					user.locale or "en",
-					gettext("Email address changed"),
-					gettext("Your email address has changed. If you didn't request this, please contact an administrator."))
+					"Email address changed",
+					"Your email address has changed. If you didn't request this, please contact an administrator.")
 
 	user.is_active = True
 	user.email = ver.email
@@ -363,15 +329,15 @@ def verify_email():
 	if current_user.is_authenticated:
 		return redirect(url_for("users.profile", username=current_user.username))
 	elif was_activating:
-		flash(gettext("You may now log in"), "success")
+		flash("You may now log in", "success")
 		return redirect(url_for("users.login"))
 	else:
 		return redirect(url_for("homepage.home"))
 
 
 class UnsubscribeForm(FlaskForm):
-	email = StringField(lazy_gettext("Email"), [InputRequired(), Email()])
-	submit = SubmitField(lazy_gettext("Send"))
+	email = StringField("Email", [InputRequired(), Email()])
+	submit = SubmitField("Send")
 
 
 def unsubscribe_verify():
@@ -383,11 +349,12 @@ def unsubscribe_verify():
 			sub = EmailSubscription(email)
 			db.session.add(sub)
 
-		sub.token = random_string(32)
+		sub.token = randomString(32)
 		db.session.commit()
-		send_unsubscribe_verify.delay(form.email.data, get_locale().language)
+		send_unsubscribe_verify.delay(form.email.data)
 
-		return redirect(url_for("users.email_sent"))
+		flash("Check your email address to continue the unsubscribe", "success")
+		return redirect(url_for("homepage.home"))
 
 	return render_template("users/unsubscribe.html", form=form)
 
@@ -402,7 +369,7 @@ def unsubscribe_manage(sub: EmailSubscription):
 		sub.blacklisted = True
 		db.session.commit()
 
-		flash(gettext("That email is now blacklisted. Please contact an admin if you wish to undo this."), "success")
+		flash("That email is now blacklisted. Please contact an admin if you wish to undo this.", "success")
 		return redirect(url_for("homepage.home"))
 
 	return render_template("users/unsubscribe.html", user=user)
@@ -417,8 +384,3 @@ def unsubscribe():
 			return unsubscribe_manage(sub)
 
 	return unsubscribe_verify()
-
-
-@bp.route("/email_sent/")
-def email_sent():
-	return render_template("users/email_sent.html")

app/blueprints/users/claim.py

@@ -14,14 +14,18 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from flask_babel import gettext
-
 from . import bp
 from flask import redirect, render_template, session, request, flash, url_for
 from app.models import db, User, UserRank
-from app.utils import random_string, login_user_set_active, is_username_valid
-from app.tasks.forumtasks import check_forum_account
-from app.utils.phpbbparser import get_profile
+from app.utils import randomString, login_user_set_active
+from app.tasks.forumtasks import checkForumAccount
+from app.utils.phpbbparser import getProfile
+import re
+
+
+def check_username(username):
+	return username is not None and len(username) >= 2 and re.match("^[A-Za-z0-9._-]*$", username)
+
 
 
 @bp.route("/user/claim/", methods=["GET", "POST"])
@@ -37,17 +41,17 @@ def claim_forums():
 	else:
 		method = request.args.get("method")
 
-		if not is_username_valid(username):
-			flash(gettext("Invalid username, Only alphabetic letters (A-Za-z), numbers (0-9), underscores (_), minuses (-), and periods (.) allowed. Consider contacting an admin"), "danger")
+		if not check_username(username):
+			flash("Invalid username - must only contain A-Za-z0-9._. Consider contacting an admin", "danger")
 			return redirect(url_for("users.claim_forums"))
 
 		user = User.query.filter_by(forums_username=username).first()
-		if user and user.rank.at_least(UserRank.NEW_MEMBER):
-			flash(gettext("User has already been claimed"), "danger")
+		if user and user.rank.atLeast(UserRank.NEW_MEMBER):
+			flash("User has already been claimed", "danger")
 			return redirect(url_for("users.claim_forums"))
 		elif method == "github":
 			if user is None or user.github_username is None:
-				flash(gettext("Unable to get GitHub username for user"), "danger")
+				flash("Unable to get GitHub username for user", "danger")
 				return redirect(url_for("users.claim_forums", username=username))
 			else:
 				return redirect(url_for("github.start"))
@@ -55,27 +59,28 @@ def claim_forums():
 	if "forum_token" in session:
 		token = session["forum_token"]
 	else:
-		token = random_string(12)
+		token = randomString(12)
 		session["forum_token"] = token
 
 	if request.method == "POST":
-		ctype = request.form.get("claim_type")
+		ctype	= request.form.get("claim_type")
 		username = request.form.get("username")
 
-		if not is_username_valid(username):
-			flash(gettext("Invalid username, Only alphabetic letters (A-Za-z), numbers (0-9), underscores (_), minuses (-), and periods (.) allowed. Consider contacting an admin"), "danger")
+		if not check_username(username):
+			flash("Invalid username - must only contain A-Za-z0-9._. Consider contacting an admin", "danger")
 		elif ctype == "github":
-			task = check_forum_account.delay(username)
+			task = checkForumAccount.delay(username)
 			return redirect(url_for("tasks.check", id=task.id, r=url_for("users.claim_forums", username=username, method="github")))
 		elif ctype == "forum":
 			user = User.query.filter_by(forums_username=username).first()
-			if user is not None and user.rank.at_least(UserRank.NEW_MEMBER):
-				flash(gettext("That user has already been claimed!"), "danger")
+			if user is not None and user.rank.atLeast(UserRank.NEW_MEMBER):
+				flash("That user has already been claimed!", "danger")
 				return redirect(url_for("users.claim_forums"))
 
 			# Get signature
+			sig = None
 			try:
-				profile = get_profile("https://forum.minetest.net", username)
+				profile = getProfile("https://forum.minetest.net", username)
 				sig = profile.signature if profile else None
 			except IOError as e:
 				if hasattr(e, 'message'):
@@ -83,11 +88,11 @@ def claim_forums():
 				else:
 					message = str(e)
 
-				flash(gettext(u"Error whilst attempting to access forums: %(message)s", message=message), "danger")
+				flash("Error whilst attempting to access forums: " + message, "danger")
 				return redirect(url_for("users.claim_forums", username=username))
 
 			if profile is None:
-				flash(gettext("Unable to get forum signature - does the user exist?"), "danger")
+				flash("Unable to get forum signature - does the user exist?", "danger")
 				return redirect(url_for("users.claim_forums", username=username))
 
 			# Look for key
@@ -100,17 +105,16 @@ def claim_forums():
 					db.session.add(user)
 					db.session.commit()
 
-				ret = login_user_set_active(user, remember=True)
-				if ret is None:
-					flash(gettext("Unable to login as user"), "danger")
+				if login_user_set_active(user, remember=True):
+					return redirect(url_for("users.set_password"))
+				else:
+					flash("Unable to login as user", "danger")
 					return redirect(url_for("users.claim_forums", username=username))
 
-				return ret
-
 			else:
-				flash(gettext("Could not find the key in your signature!"), "danger")
+				flash("Could not find the key in your signature!", "danger")
 				return redirect(url_for("users.claim_forums", username=username))
 		else:
-			flash(gettext("Unknown claim type"), "danger")
+			flash("Unknown claim type", "danger")
 
 	return render_template("users/claim_forums.html", username=username, key="cdb_" + token)

app/blueprints/users/profile.py

@@ -14,18 +14,13 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import math
-from typing import Optional, Tuple, List
 
-from flask import redirect, url_for, abort, render_template, request
-from flask_babel import gettext
+from flask import *
 from flask_login import current_user, login_required
-from sqlalchemy import func, text
-
-from app.models import User, db, Package, PackageReview, PackageState, PackageType, UserRank
-from app.utils import get_daterange_options
-from app.tasks.forumtasks import check_forum_account
+from sqlalchemy import func
 
+from app.models import *
+from app.tasks.forumtasks import checkForumAccount
 from . import bp
 
 
@@ -48,229 +43,35 @@ def by_forums_username(username):
 	return render_template("users/forums_no_such_user.html", username=username)
 
 
-class Medal:
-	description: str
-	color: Optional[str]
-	icon: str
-	title: Optional[str]
-	progress: Optional[Tuple[int, int]]
-
-	def __init__(self, description: str, **kwargs):
-		self.description = description
-		self.color = kwargs.get("color", "white")
-		self.icon = kwargs.get("icon", None)
-		self.title = kwargs.get("title", None)
-		self.progress = kwargs.get("progress", None)
-
-	@classmethod
-	def make_unlocked(cls, color: str, icon: str, title: str, description: str):
-		return Medal(description=description, color=color, icon=icon, title=title)
-
-	@classmethod
-	def make_locked(cls, description: str, progress: Tuple[int, int]):
-		if progress[0] is None or progress[1] is None:
-			raise Exception("Invalid progress")
-
-		return Medal(description=description, progress=progress)
-
-
-def place_to_color(place: int) -> str:
-	if place == 1:
-		return "gold"
-	elif place == 2:
-		return "#888"
-	elif place == 3:
-		return "#cd7f32"
-	else:
-		return "white"
-
-
-def get_user_medals(user: User) -> Tuple[List[Medal], List[Medal]]:
-	unlocked = []
-	locked = []
-
-	#
-	# REVIEWS
-	#
-
-	users_by_reviews = db.session.query(User.username, func.sum(PackageReview.score).label("karma")) \
-		.select_from(User).join(PackageReview) \
-		.group_by(User.username).order_by(text("karma DESC")).all()
-	try:
-		review_boundary = users_by_reviews[math.floor(len(users_by_reviews) * 0.25)][1] + 1
-	except IndexError:
-		review_boundary = None
-	usernames_by_reviews = [username for username, _ in users_by_reviews]
-
-	review_idx = None
-	review_percent = None
-	review_karma = 0
-	try:
-		review_idx = usernames_by_reviews.index(user.username)
-		review_percent = round(100 * review_idx / len(users_by_reviews), 1)
-		review_karma = max(users_by_reviews[review_idx][1], 0)
-	except ValueError:
-		pass
-
-	if review_percent is not None and review_percent < 25:
-		if review_idx == 0:
-			title = gettext(u"Top reviewer")
-			description = gettext(
-					u"%(display_name)s has written the most helpful reviews on ContentDB.",
-					display_name=user.display_name)
-		elif review_idx <= 2:
-			if review_idx == 1:
-				title = gettext(u"2nd most helpful reviewer")
-			else:
-				title = gettext(u"3rd most helpful reviewer")
-			description = gettext(
-					u"This puts %(display_name)s in the top %(perc)s%%",
-					display_name=user.display_name, perc=review_percent)
-		else:
-			title = gettext(u"Top %(perc)s%% reviewer", perc=review_percent)
-			description = gettext(u"Only %(place)d users have written more helpful reviews.", place=review_idx)
-
-		unlocked.append(Medal.make_unlocked(
-				place_to_color(review_idx + 1), "fa-star-half-alt", title, description))
-	elif review_boundary is not None:
-		description = gettext(u"Consider writing more helpful reviews to get a medal.")
-		if review_idx:
-			description += " " + gettext(u"You are in place %(place)s.", place=review_idx + 1)
-		locked.append(Medal.make_locked(
-				description, (review_karma, review_boundary)))
-
-	#
-	# TOP PACKAGES
-	#
-	all_package_ranks = db.session.query(
-			Package.type,
-			Package.author_id,
-			func.rank().over(
-					order_by=db.desc(Package.score),
-					partition_by=Package.type) \
-				.label("rank")).order_by(db.asc(text("rank"))) \
-		.filter_by(state=PackageState.APPROVED).subquery()
-
-	user_package_ranks = db.session.query(all_package_ranks) \
-		.filter_by(author_id=user.id) \
-		.filter(text("rank <= 30")) \
-		.all()
-
-	user_package_ranks = next(
-			(x for x in user_package_ranks if x[0] == PackageType.MOD or x[2] <= 10),
-			None)
-	if user_package_ranks:
-		top_rank = user_package_ranks[2]
-		top_type = PackageType.coerce(user_package_ranks[0])
-		if top_rank == 1:
-			title = gettext(u"Top %(type)s", type=top_type.text.lower())
-		else:
-			title = gettext(u"Top %(group)d %(type)s", group=top_rank, type=top_type.text.lower())
-		if top_type == PackageType.MOD:
-			icon = "fa-box"
-		elif top_type == PackageType.GAME:
-			icon = "fa-gamepad"
-		else:
-			icon = "fa-paint-brush"
-
-		description = gettext(u"%(display_name)s has a %(type)s placed at #%(place)d.",
-				display_name=user.display_name, type=top_type.text.lower(), place=top_rank)
-		unlocked.append(
-				Medal.make_unlocked(place_to_color(top_rank), icon, title, description))
-
-	#
-	# DOWNLOADS
-	#
-	total_downloads = db.session.query(func.sum(Package.downloads)) \
-		.select_from(User) \
-		.join(User.packages) \
-		.filter(User.id == user.id,
-			Package.state == PackageState.APPROVED).scalar()
-	if total_downloads is None:
-		pass
-	elif total_downloads < 50000:
-		description = gettext(u"Your packages have %(downloads)d downloads in total.", downloads=total_downloads)
-		description += " " + gettext(u"First medal is at 50k.")
-		locked.append(Medal.make_locked(description, (total_downloads, 50000)))
-	else:
-		if total_downloads >= 300000:
-			place = 1
-			title = gettext(u">300k downloads")
-		elif total_downloads >= 100000:
-			place = 2
-			title = gettext(u">100k downloads")
-		elif total_downloads >= 75000:
-			place = 3
-			title = gettext(u">75k downloads")
-		else:
-			place = 10
-			title = gettext(u">50k downloads")
-		description = gettext(u"Has received %(downloads)d downloads across all packages.",
-				display_name=user.display_name, downloads=total_downloads)
-		unlocked.append(Medal.make_unlocked(place_to_color(place), "fa-users", title, description))
-
-	return unlocked, locked
-
-
 @bp.route("/users/<username>/")
 def profile(username):
 	user = User.query.filter_by(username=username).first()
 	if not user:
 		abort(404)
 
-	if not current_user.is_authenticated or (user != current_user and not current_user.can_access_todo_list()):
-		packages = user.packages.filter_by(state=PackageState.APPROVED)
-		maintained_packages = user.maintained_packages.filter_by(state=PackageState.APPROVED)
-	else:
-		packages = user.packages.filter(Package.state != PackageState.DELETED)
-		maintained_packages = user.maintained_packages.filter(Package.state != PackageState.DELETED)
+	packages = user.packages.filter(Package.state != PackageState.DELETED)
+	if not current_user.is_authenticated or (user != current_user and not current_user.canAccessTodoList()):
+		packages = packages.filter_by(state=PackageState.APPROVED)
+	packages = packages.order_by(db.asc(Package.title))
 
-	packages = packages.order_by(db.asc(Package.title)).all()
-	maintained_packages = maintained_packages \
-		.filter(Package.author != user) \
-		.order_by(db.asc(Package.title)).all()
-
-	unlocked, locked = get_user_medals(user)
 	# Process GET or invalid POST
-	return render_template("users/profile.html", user=user,
-			packages=packages, maintained_packages=maintained_packages,
-			medals_unlocked=unlocked, medals_locked=locked)
+	return render_template("users/profile.html", user=user, packages=packages)
 
 
-@bp.route("/users/<username>/check-forums/", methods=["POST"])
+@bp.route("/users/<username>/check/", methods=["POST"])
 @login_required
-def user_check_forums(username):
+def user_check(username):
 	user = User.query.filter_by(username=username).first()
 	if user is None:
 		abort(404)
 
-	if current_user != user and not current_user.rank.at_least(UserRank.MODERATOR):
+	if current_user != user and not current_user.rank.atLeast(UserRank.MODERATOR):
 		abort(403)
 
 	if user.forums_username is None:
 		abort(404)
 
-	task = check_forum_account.delay(user.forums_username, force_replace_pic=True)
+	task = checkForumAccount.delay(user.forums_username)
 	next_url = url_for("users.profile", username=username)
 
 	return redirect(url_for("tasks.check", id=task.id, r=next_url))
-
-
-@bp.route("/user/stats/")
-@login_required
-def statistics_redirect():
-	return redirect(url_for("users.statistics", username=current_user.username))
-
-
-@bp.route("/users/<username>/stats/")
-def statistics(username):
-	user = User.query.filter_by(username=username).first()
-	if user is None:
-		abort(404)
-
-	downloads = db.session.query(func.sum(Package.downloads)).filter(Package.author==user).one()
-
-	start = request.args.get("start")
-	end = request.args.get("end")
-	return render_template("users/stats.html", user=user, downloads=downloads[0],
-			start=start, end=end, options=get_daterange_options(), noindex=start or end)

app/blueprints/users/settings.py

@@ -1,123 +1,44 @@
-# ContentDB
-# Copyright (C) 2023 rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-from flask import redirect, abort, render_template, request, flash, url_for
-from flask_babel import gettext, get_locale, lazy_gettext
+from flask import *
 from flask_login import current_user, login_required, logout_user
 from flask_wtf import FlaskForm
-from sqlalchemy import or_
-from wtforms import StringField, SubmitField, BooleanField, SelectField
-from wtforms.validators import Length, Optional, Email, URL
+from wtforms import *
+from wtforms.validators import *
 
-from app.models import User, AuditSeverity, db, UserRank, PackageAlias, EmailSubscription, UserNotificationPreferences, \
-	UserEmailVerification, Permission, NotificationType, UserBan
+from app.models import *
+from app.utils import nonEmptyOrNone, addAuditLog, randomString, rank_required
 from app.tasks.emails import send_verify_email
-from app.utils import nonempty_or_none, add_audit_log, random_string, rank_required, has_blocked_domains
 from . import bp
 
 
 def get_setting_tabs(user):
-	ret = [
+	return [
 		{
 			"id": "edit_profile",
-			"title": gettext("Edit Profile"),
+			"title": "Edit Profile",
 			"url": url_for("users.profile_edit", username=user.username)
 		},
 		{
 			"id": "account",
-			"title": gettext("Account and Security"),
+			"title": "Account and Security",
 			"url": url_for("users.account", username=user.username)
 		},
 		{
 			"id": "notifications",
-			"title": gettext("Email and Notifications"),
+			"title": "Email and Notifications",
 			"url": url_for("users.email_notifications", username=user.username)
 		},
 		{
 			"id": "api_tokens",
-			"title": gettext("API Tokens"),
+			"title": "API Tokens",
 			"url": url_for("api.list_tokens", username=user.username)
 		},
 	]
 
-	if user.check_perm(current_user, Permission.CREATE_OAUTH_CLIENT):
-		ret.append({
-			"id": "oauth_clients",
-			"title": gettext("OAuth2 Applications"),
-			"url": url_for("oauth.list_clients", username=user.username)
-		})
-
-	if current_user.rank.at_least(UserRank.MODERATOR):
-		ret.append({
-			"id": "modtools",
-			"title": gettext("Moderator Tools"),
-			"url": url_for("users.modtools", username=user.username)
-		})
-
-	return ret
-
 
 class UserProfileForm(FlaskForm):
-	display_name = StringField(lazy_gettext("Display Name"), [Optional(), Length(1, 20)], filters=[lambda x: nonempty_or_none(x.strip())])
-	website_url = StringField(lazy_gettext("Website URL"), [Optional(), URL()], filters = [lambda x: x or None])
-	donate_url = StringField(lazy_gettext("Donation URL"), [Optional(), URL()], filters = [lambda x: x or None])
-	submit = SubmitField(lazy_gettext("Save"))
-
-
-def handle_profile_edit(form: UserProfileForm, user: User, username: str):
-	severity = AuditSeverity.NORMAL if current_user == user else AuditSeverity.MODERATION
-	add_audit_log(severity, current_user, "Edited {}'s profile".format(user.display_name),
-				  url_for("users.profile", username=username))
-
-	display_name = form.display_name.data or user.username
-	if user.check_perm(current_user, Permission.CHANGE_DISPLAY_NAME) and \
-			user.display_name != display_name:
-
-		if User.query.filter(User.id != user.id,
-				or_(User.username == display_name,
-						User.display_name.ilike(display_name))).count() > 0:
-			flash(gettext("A user already has that name"), "danger")
-			return None
-
-
-		alias_by_name = PackageAlias.query.filter(or_(
-				PackageAlias.author == display_name)).first()
-		if alias_by_name:
-			flash(gettext("A user already has that name"), "danger")
-			return
-
-		user.display_name = display_name
-
-		severity = AuditSeverity.USER if current_user == user else AuditSeverity.MODERATION
-		add_audit_log(severity, current_user, "Changed display name of {} to {}"
-					  .format(user.username, user.display_name),
-					  url_for("users.profile", username=username))
-
-	if user.check_perm(current_user, Permission.CHANGE_PROFILE_URLS):
-		if has_blocked_domains(form.website_url.data, current_user.username, f"{user.username}'s website_url") or \
-				has_blocked_domains(form.donate_url.data, current_user.username, f"{user.username}'s donate_url"):
-			flash(gettext("Linking to blocked sites is not allowed"), "danger")
-			return
-
-		user.website_url = form.website_url.data
-		user.donate_url = form.donate_url.data
-
-	db.session.commit()
-
-	return redirect(url_for("users.profile", username=username))
+	website_url = StringField("Website URL", [Optional(), URL()], filters = [lambda x: x or None])
+	donate_url = StringField("Donation URL", [Optional(), URL()], filters = [lambda x: x or None])
+	submit = SubmitField("Save")
 
 
 @bp.route("/users/<username>/settings/profile/", methods=["GET", "POST"])
@@ -128,14 +49,22 @@ def profile_edit(username):
 		abort(404)
 
 	if not user.can_see_edit_profile(current_user):
-		flash(gettext("Permission denied"), "danger")
+		flash("Permission denied", "danger")
 		return redirect(url_for("users.profile", username=username))
 
 	form = UserProfileForm(obj=user)
 	if form.validate_on_submit():
-		ret = handle_profile_edit(form, user, username)
-		if ret:
-			return ret
+		severity = AuditSeverity.NORMAL if current_user == user else AuditSeverity.MODERATION
+		addAuditLog(severity, current_user, "Edited {}'s profile".format(user.display_name),
+				url_for("users.profile", username=username))
+
+		if user.checkPerm(current_user, Permission.CHANGE_PROFILE_URLS):
+			user.website_url  = form["website_url"].data
+			user.donate_url   = form["donate_url"].data
+
+		db.session.commit()
+
+		return redirect(url_for("users.profile", username=username))
 
 	# Process GET or invalid POST
 	return render_template("users/profile_edit.html", user=user, form=form, tabs=get_setting_tabs(user), current_tab="edit_profile")
@@ -143,12 +72,12 @@ def profile_edit(username):
 
 def make_settings_form():
 	attrs = {
-		"email": StringField(lazy_gettext("Email"), [Optional(), Email()]),
-		"submit": SubmitField(lazy_gettext("Save"))
+		"email": StringField("Email", [Optional(), Email()]),
+		"submit": SubmitField("Save")
 	}
 
 	for notificationType in NotificationType:
-		key = "pref_" + notificationType.to_name()
+		key = "pref_" + notificationType.toName()
 		attrs[key] = BooleanField("")
 		attrs[key + "_digest"] = BooleanField("")
 
@@ -159,27 +88,27 @@ SettingsForm = make_settings_form()
 
 def handle_email_notifications(user, prefs: UserNotificationPreferences, is_new, form):
 	for notificationType in NotificationType:
-		field_email = getattr(form, "pref_" + notificationType.to_name()).data
-		field_digest = getattr(form, "pref_" + notificationType.to_name() + "_digest").data or field_email
+		field_email = getattr(form, "pref_" + notificationType.toName()).data
+		field_digest = getattr(form, "pref_" + notificationType.toName() + "_digest").data or field_email
 		prefs.set_can_email(notificationType, field_email)
 		prefs.set_can_digest(notificationType, field_digest)
 
 	if is_new:
 		db.session.add(prefs)
 
-	if user.check_perm(current_user, Permission.CHANGE_EMAIL):
+	if user.checkPerm(current_user, Permission.CHANGE_EMAIL):
 		newEmail = form.email.data
 		if newEmail and newEmail != user.email and newEmail.strip() != "":
 			if EmailSubscription.query.filter_by(email=form.email.data, blacklisted=True).count() > 0:
-				flash(gettext("That email address has been unsubscribed/blacklisted, and cannot be used"), "danger")
+				flash("That email address has been unsubscribed/blacklisted, and cannot be used", "danger")
 				return
 
-			token = random_string(32)
+			token = randomString(32)
 
 			severity = AuditSeverity.NORMAL if current_user == user else AuditSeverity.MODERATION
 
 			msg = "Changed email of {}".format(user.display_name)
-			add_audit_log(severity, current_user, msg, url_for("users.profile", username=user.username))
+			addAuditLog(severity, current_user, msg, url_for("users.profile", username=user.username))
 
 			ver = UserEmailVerification()
 			ver.user = user
@@ -188,8 +117,10 @@ def handle_email_notifications(user, prefs: UserNotificationPreferences, is_new,
 			db.session.add(ver)
 			db.session.commit()
 
-			send_verify_email.delay(newEmail, token, get_locale().language)
-			return redirect(url_for("users.email_sent"))
+			flash("Check your email to confirm it", "success")
+
+			send_verify_email.delay(newEmail, token)
+			return redirect(url_for("users.email_notifications", username=user.username))
 
 	db.session.commit()
 	return redirect(url_for("users.email_notifications", username=user.username))
@@ -206,7 +137,7 @@ def email_notifications(username=None):
 	if not user:
 		abort(404)
 
-	if not user.check_perm(current_user, Permission.CHANGE_EMAIL):
+	if not user.checkPerm(current_user, Permission.CHANGE_EMAIL):
 		abort(403)
 
 	is_new = False
@@ -219,8 +150,8 @@ def email_notifications(username=None):
 	types = []
 	for notificationType in NotificationType:
 		types.append(notificationType)
-		data["pref_" + notificationType.to_name()] = prefs.get_can_email(notificationType)
-		data["pref_" + notificationType.to_name() + "_digest"] = prefs.get_can_digest(notificationType)
+		data["pref_" + notificationType.toName()] = prefs.get_can_email(notificationType)
+		data["pref_" + notificationType.toName() + "_digest"] = prefs.get_can_digest(notificationType)
 
 	data["email"] = user.email
 
@@ -235,14 +166,56 @@ def email_notifications(username=None):
 			tabs=get_setting_tabs(user), current_tab="notifications")
 
 
-@bp.route("/users/<username>/settings/account/")
+class UserAccountForm(FlaskForm):
+	display_name = StringField("Display name", [Optional(), Length(2, 100)])
+	forums_username = StringField("Forums Username", [Optional(), Length(2, 50)])
+	github_username = StringField("GitHub Username", [Optional(), Length(2, 50)])
+	rank = SelectField("Rank", [Optional()], choices=UserRank.choices(), coerce=UserRank.coerce,
+			default=UserRank.NEW_MEMBER)
+	submit = SubmitField("Save")
+
+
+@bp.route("/users/<username>/settings/account/", methods=["GET", "POST"])
 @login_required
 def account(username):
 	user : User = User.query.filter_by(username=username).first()
 	if not user:
 		abort(404)
 
-	return render_template("users/account.html", user=user, tabs=get_setting_tabs(user), current_tab="account")
+	if not user.can_see_edit_profile(current_user):
+		flash("Permission denied", "danger")
+		return redirect(url_for("users.profile", username=username))
+
+	can_edit_account_settings = user.checkPerm(current_user, Permission.CHANGE_USERNAMES) or \
+			user.checkPerm(current_user, Permission.CHANGE_RANK)
+	form = UserAccountForm(obj=user) if can_edit_account_settings else None
+	if form and form.validate_on_submit():
+		severity = AuditSeverity.NORMAL if current_user == user else AuditSeverity.MODERATION
+		addAuditLog(severity, current_user, "Edited {}'s profile".format(user.display_name),
+				url_for("users.profile", username=username))
+
+		# Copy form fields to user_profile fields
+		if user.checkPerm(current_user, Permission.CHANGE_USERNAMES):
+			user.display_name = form.display_name.data
+			user.forums_username = nonEmptyOrNone(form.forums_username.data)
+			user.github_username = nonEmptyOrNone(form.github_username.data)
+
+		if user.checkPerm(current_user, Permission.CHANGE_RANK):
+			newRank = form["rank"].data
+			if current_user.rank.atLeast(newRank):
+				if newRank != user.rank:
+					user.rank = form["rank"].data
+					msg = "Set rank of {} to {}".format(user.display_name, user.rank.getTitle())
+					addAuditLog(AuditSeverity.MODERATION, current_user, msg,
+							url_for("users.profile", username=username))
+			else:
+				flash("Can't promote a user to a rank higher than yourself!", "danger")
+
+		db.session.commit()
+
+		return redirect(url_for("users.account", username=username))
+
+	return render_template("users/account.html", user=user, form=form, tabs=get_setting_tabs(user), current_tab="account")
 
 
 @bp.route("/users/<username>/delete/", methods=["GET", "POST"])
@@ -252,39 +225,29 @@ def delete(username):
 	if not user:
 		abort(404)
 
-	if user.rank.at_least(UserRank.MODERATOR):
-		flash(gettext("Users with moderator rank or above cannot be deleted"), "danger")
+	if user.rank.atLeast(UserRank.MODERATOR):
+		flash("Users with moderator rank or above cannot be deleted", "danger")
 		return redirect(url_for("users.account", username=username))
 
 	if request.method == "GET":
 		return render_template("users/delete.html", user=user, can_delete=user.can_delete())
 
-	if "delete" in request.form and (user.can_delete() or current_user.rank.at_least(UserRank.ADMIN)):
+	if user.can_delete():
 		msg = "Deleted user {}".format(user.username)
 		flash(msg, "success")
-		add_audit_log(AuditSeverity.MODERATION, current_user, msg, None)
-
-		if current_user.rank.at_least(UserRank.ADMIN):
-			for pkg in user.packages.all():
-				pkg.review_thread = None
-				db.session.delete(pkg)
+		addAuditLog(AuditSeverity.MODERATION, current_user, msg, None)
 
 		db.session.delete(user)
-	elif "deactivate" in request.form:
-		for reply in user.replies.all():
-			db.session.delete(reply)
+	else:
+		user.replies.delete()
 		for thread in user.threads.all():
 			db.session.delete(thread)
 		user.email = None
-
-		if user.rank != UserRank.BANNED:
-			user.rank = UserRank.NOT_JOINED
+		user.rank = UserRank.NOT_JOINED
 
 		msg = "Deactivated user {}".format(user.username)
 		flash(msg, "success")
-		add_audit_log(AuditSeverity.MODERATION, current_user, msg, None)
-	else:
-		assert False
+		addAuditLog(AuditSeverity.MODERATION, current_user, msg, None)
 
 	db.session.commit()
 
@@ -292,146 +255,3 @@ def delete(username):
 		logout_user()
 
 	return redirect(url_for("homepage.home"))
-
-
-class ModToolsForm(FlaskForm):
-	username = StringField(lazy_gettext("Username"), [Optional(), Length(1, 50)])
-	display_name = StringField(lazy_gettext("Display name"), [Optional(), Length(2, 100)])
-	forums_username = StringField(lazy_gettext("Forums Username"), [Optional(), Length(2, 50)])
-	github_username = StringField(lazy_gettext("GitHub Username"), [Optional(), Length(2, 50)])
-	rank = SelectField(lazy_gettext("Rank"), [Optional()], choices=UserRank.choices(), coerce=UserRank.coerce,
-			default=UserRank.NEW_MEMBER)
-	submit = SubmitField(lazy_gettext("Save"))
-
-
-@bp.route("/users/<username>/modtools/", methods=["GET", "POST"])
-@rank_required(UserRank.MODERATOR)
-def modtools(username):
-	user: User = User.query.filter_by(username=username).first()
-	if not user:
-		abort(404)
-
-	if not user.check_perm(current_user, Permission.CHANGE_EMAIL):
-		abort(403)
-
-	form = ModToolsForm(obj=user)
-	if form.validate_on_submit():
-		severity = AuditSeverity.NORMAL if current_user == user else AuditSeverity.MODERATION
-		add_audit_log(severity, current_user, "Edited {}'s account".format(user.display_name),
-					  url_for("users.profile", username=username))
-
-		# Copy form fields to user_profile fields
-		if user.check_perm(current_user, Permission.CHANGE_USERNAMES):
-			if user.username != form.username.data:
-				for package in user.packages:
-					alias = PackageAlias(user.username, package.name)
-					package.aliases.append(alias)
-					db.session.add(alias)
-
-				user.username = form.username.data
-
-			user.display_name = form.display_name.data
-			user.forums_username = nonempty_or_none(form.forums_username.data)
-			user.github_username = nonempty_or_none(form.github_username.data)
-
-		if user.check_perm(current_user, Permission.CHANGE_RANK):
-			new_rank = form["rank"].data
-			if current_user.rank.at_least(new_rank):
-				if new_rank != user.rank:
-					user.rank = form["rank"].data
-					msg = "Set rank of {} to {}".format(user.display_name, user.rank.get_title())
-					add_audit_log(AuditSeverity.MODERATION, current_user, msg,
-								  url_for("users.profile", username=username))
-			else:
-				flash(gettext("Can't promote a user to a rank higher than yourself!"), "danger")
-
-		db.session.commit()
-
-		return redirect(url_for("users.modtools", username=username))
-
-	return render_template("users/modtools.html", user=user, form=form, tabs=get_setting_tabs(user), current_tab="modtools")
-
-
-@bp.route("/users/<username>/modtools/set-email/", methods=["POST"])
-@rank_required(UserRank.MODERATOR)
-def modtools_set_email(username):
-	user: User = User.query.filter_by(username=username).first()
-	if not user:
-		abort(404)
-
-	if not user.check_perm(current_user, Permission.CHANGE_EMAIL):
-		abort(403)
-
-	user.email = request.form["email"]
-	user.is_active = False
-
-	token = random_string(32)
-	add_audit_log(AuditSeverity.MODERATION, current_user, f"Set email and sent a password reset on {user.username}",
-				  url_for("users.profile", username=user.username), None)
-
-	ver = UserEmailVerification()
-	ver.user = user
-	ver.token = token
-	ver.email = user.email
-	ver.is_password_reset = True
-	db.session.add(ver)
-	db.session.commit()
-
-	send_verify_email.delay(user.email, token, user.locale or "en")
-
-	flash(f"Set email and sent a password reset on {user.username}", "success")
-	return redirect(url_for("users.modtools", username=username))
-
-
-@bp.route("/users/<username>/modtools/ban/", methods=["POST"])
-@rank_required(UserRank.MODERATOR)
-def modtools_ban(username):
-	user: User = User.query.filter_by(username=username).first()
-	if not user:
-		abort(404)
-
-	if not user.check_perm(current_user, Permission.CHANGE_RANK):
-		abort(403)
-
-	message = request.form["message"]
-	expires_at = request.form.get("expires_at")
-
-	user.ban = UserBan()
-	user.ban.banned_by = current_user
-	user.ban.message = message
-
-	if expires_at and expires_at != "":
-		user.ban.expires_at = expires_at
-	else:
-		user.rank = UserRank.BANNED
-
-	add_audit_log(AuditSeverity.MODERATION, current_user, f"Banned {user.username}, expires {user.ban.expires_at or '-'}, message: {message}",
-				  url_for("users.profile", username=user.username), None)
-	db.session.commit()
-
-	flash(f"Banned {user.username}", "success")
-	return redirect(url_for("users.modtools", username=username))
-
-
-@bp.route("/users/<username>/modtools/unban/", methods=["POST"])
-@rank_required(UserRank.MODERATOR)
-def modtools_unban(username):
-	user: User = User.query.filter_by(username=username).first()
-	if not user:
-		abort(404)
-
-	if not user.check_perm(current_user, Permission.CHANGE_RANK):
-		abort(403)
-
-	if user.ban:
-		db.session.delete(user.ban)
-
-	if user.rank == UserRank.BANNED:
-		user.rank = UserRank.MEMBER
-
-	add_audit_log(AuditSeverity.MODERATION, current_user, f"Unbanned {user.username}",
-				  url_for("users.profile", username=user.username), None)
-	db.session.commit()
-
-	flash(f"Unbanned {user.username}", "success")
-	return redirect(url_for("users.modtools", username=username))

app/blueprints/zipgrep/__init__.py

@@ -1,70 +0,0 @@
-# ContentDB
-# Copyright (C) 2022 rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-
-from celery import uuid
-from flask import Blueprint, render_template, redirect, request, abort, url_for
-from flask_babel import lazy_gettext
-from flask_wtf import FlaskForm
-from wtforms import StringField, BooleanField, SubmitField
-from wtforms.validators import InputRequired, Length
-
-from app.tasks import celery
-from app.utils import rank_required
-
-bp = Blueprint("zipgrep", __name__)
-
-from app.models import UserRank, Package
-from app.tasks.zipgrep import search_in_releases
-
-
-class SearchForm(FlaskForm):
-	query = StringField(lazy_gettext("Text to find (regex)"), [InputRequired(), Length(1, 100)])
-	file_filter = StringField(lazy_gettext("File filter"), [InputRequired(), Length(1, 100)], default="*.lua")
-	remember_me = BooleanField(lazy_gettext("Remember me"), default=True)
-	submit = SubmitField(lazy_gettext("Search"))
-
-
-@bp.route("/zipgrep/", methods=["GET", "POST"])
-@rank_required(UserRank.EDITOR)
-def zipgrep_search():
-	form = SearchForm(request.form)
-	if form.validate_on_submit():
-		task_id = uuid()
-		search_in_releases.apply_async((form.query.data, form.file_filter.data), task_id=task_id)
-		result_url = url_for("zipgrep.view_results", id=task_id)
-		return redirect(url_for("tasks.check", id=task_id, r=result_url))
-
-	return render_template("zipgrep/search.html", form=form)
-
-
-@bp.route("/zipgrep/<id>/")
-def view_results(id):
-	result = celery.AsyncResult(id)
-	if result.status == "PENDING":
-		abort(404)
-
-	if result.status != "SUCCESS" or isinstance(result.result, Exception):
-		result_url = url_for("zipgrep.view_results", id=id)
-		return redirect(url_for("tasks.check", id=id, r=result_url))
-
-	matches = result.result["matches"]
-	for match in matches:
-		match["package"] = Package.query.filter(
-				Package.name == match["package"]["name"],
-				Package.author.has(username=match["package"]["author"])).one()
-
-	return render_template("zipgrep/view_results.html", query=result.result["query"], matches=matches)

app/default_data.py

@@ -1,23 +1,4 @@
-# ContentDB
-# Copyright (C) rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import datetime
-
-from .models import User, UserRank, MinetestRelease, Tag, License, Notification, NotificationType, Package, \
-	PackageState, PackageType, PackageRelease, MetaPackage, Dependency
+from .models import *
 from .utils import make_flask_login_password
 
 
@@ -30,31 +11,24 @@ def populate(session):
 	admin_user.rank = UserRank.ADMIN
 	session.add(admin_user)
 
-	system_user = User("ContentDB", active=False)
-	system_user.email_confirmed_at = datetime.datetime.now() - datetime.timedelta(days=6000)
-	system_user.rank = UserRank.BOT
-	session.add(system_user)
-
 	session.add(MinetestRelease("None", 0))
 	session.add(MinetestRelease("0.4.16/17", 32))
 	session.add(MinetestRelease("5.0", 37))
 	session.add(MinetestRelease("5.1", 38))
-	session.add(MinetestRelease("5.2", 39))
-	session.add(MinetestRelease("5.3", 39))
 
 	tags = {}
 	for tag in ["Inventory", "Mapgen", "Building",
-			"Mobs and NPCs", "Tools", "Player effects",
-			"Environment", "Transport", "Maintenance", "Plants and farming",
-			"PvP", "PvE", "Survival", "Creative", "Puzzle", "Multiplayer", "Singleplayer"]:
+		"Mobs and NPCs", "Tools", "Player effects",
+		"Environment", "Transport", "Maintenance", "Plants and farming",
+		"PvP", "PvE", "Survival", "Creative", "Puzzle", "Multiplayer", "Singleplayer"]:
 		row = Tag(tag)
 		tags[row.name] = row
 		session.add(row)
 
 	licenses = {}
 	for license in ["GPLv2.1", "GPLv3", "LGPLv2.1", "LGPLv3", "AGPLv2.1", "AGPLv3",
-			"Apache", "BSD 3-Clause", "BSD 2-Clause", "CC0", "CC-BY-SA",
-			"CC-BY", "MIT", "ZLib", "Other (Free)"]:
+					"Apache", "BSD 3-Clause", "BSD 2-Clause", "CC0", "CC-BY-SA",
+					"CC-BY", "MIT", "ZLib", "Other (Free)"]:
 		row = License(license)
 		licenses[row.name] = row
 		session.add(row)
@@ -70,6 +44,7 @@ def populate_test_data(session):
 	tags = { x.name : x for x in Tag.query.all() }
 	admin_user = User.query.filter_by(rank=UserRank.ADMIN).first()
 	v4 = MinetestRelease.query.filter_by(protocol=32).first()
+	v50 = MinetestRelease.query.filter_by(protocol=37).first()
 	v51 = MinetestRelease.query.filter_by(protocol=38).first()
 
 	ez = User("Shara")
@@ -78,7 +53,7 @@ def populate_test_data(session):
 	ez.rank = UserRank.EDITOR
 	session.add(ez)
 
-	not1 = Notification(admin_user, ez, NotificationType.PACKAGE_APPROVAL, "Awards approved", "/packages/rubenwardy/awards/")
+	not1 = Notification(admin_user, ez, "Awards approved", "/packages/rubenwardy/awards/")
 	session.add(not1)
 
 	jeija = User("Jeija")
@@ -86,6 +61,7 @@ def populate_test_data(session):
 	jeija.forums_username = "Jeija"
 	session.add(jeija)
 
+
 	mod = Package()
 	mod.state = PackageState.APPROVED
 	mod.name = "alpha"
@@ -378,7 +354,7 @@ Uses the CTF PvP Engine.
 	mod.name = "pixelbox"
 	mod.title = "PixelBOX Reloaded"
 	mod.license = licenses["CC0"]
-	mod.media_license = licenses["CC0"]
+	mod.media_license = licenses["MIT"]
 	mod.type = PackageType.TXP
 	mod.author = admin_user
 	mod.forums = 14132
@@ -397,6 +373,7 @@ Uses the CTF PvP Engine.
 
 	metas = {}
 	for package in Package.query.filter_by(type=PackageType.MOD).all():
+		meta = None
 		try:
 			meta = metas[package.name]
 		except KeyError:

app/flatpages/about.md

@@ -1,39 +0,0 @@
-title: About ContentDB
-description: Information about ContentDB's development, history, and more
-toc: False
-
-## Development
-
-ContentDB was created by [rubenwardy](https://rubenwardy.com/) in 2018, he was lucky enough to have the time available
-as it was submitted as university coursework. To learn about the history and development of ContentDB,
-[see the blog post](https://blog.rubenwardy.com/2022/03/24/contentdb/).
-
-ContentDB is open source software, licensed under AGPLv3.0.
-
-<a href="https://github.com/minetest/contentdb/" class="btn btn-primary me-1">Source code</a>
-<a href="https://github.com/minetest/contentdb/issues/" class="btn btn-secondary me-1">Issue tracker</a>
-<a href="https://rubenwardy.com/contact/" class="btn btn-secondary me-1">Contact admin</a>
-<a href="https://monitor.rubenwardy.com/d/3ELzFy3Wz/contentdb" class="btn btn-secondary">Stats / monitoring</a>
-
-## Why was ContentDB created?
-
-Before ContentDB, users had to manually install mods and games by unzipping their files into a directory. This is
-poor user experience, especially for first-time users.
-
-ContentDB isn't just about supporting the in-game content downloader; it's common for technical users to find
-and review packages using the ContentDB website, but install using Git rather than the in-game installer.
-**ContentDB's purpose is to be a well-formatted source of information about mods, games,
-and texture packs for Minetest**.
-
-## How do I learn how to make mods and games for Minetest?
-
-You should read
-[the official Minetest Modding Book](https://rubenwardy.com/minetest_modding_book/)
-for a guide to making mods and games using Minetest.
-
-## How can I support / donate to ContentDB?
-
-You can donate to rubenwardy to cover ContentDB's costs and support future
-development.
-
-<a href="https://rubenwardy.com/donate/" class="btn btn-primary me-1">Donate</a>

app/flatpages/help.md

@@ -1,39 +1,27 @@
 title: Help
 toc: False
 
-
-## Rules
-
-* [Rules](/rules/)
-* [Package Inclusion Policy and Guidance](/policy_and_guidance/)
-
 ## General Help
 
-* [Frequently Asked Questions](faq/)
-* [Installing content](installing/)
-* [Content Ratings and Flags](content_flags/)
-* [Non-free Licenses](non_free/)
-* [Why WTFPL is a terrible license](wtfpl/)
-* [Ranks and Permissions](ranks_permissions/)
-* [Contact Us](contact_us/)
-* [Top Packages Algorithm](top_packages/)
-* [Featured Packages](featured/)
+* [Content Ratings and Flags](content_flags)
+* [Non-free Licenses](non_free)
+* [Why WTFPL is a terrible license](wtfpl)
+* [Ranks and Permissions](ranks_permissions)
+* [Reporting Content](reporting)
+* [Top Packages Algorithm](top_packages)
 
 ## Help for Package Authors
 
 * [Package Inclusion Policy and Guidance](/policy_and_guidance/)
-* [Copyright Guide](copyright/)
-* [Git Update Detection](update_config/)
-* [Creating Releases using Webhooks](release_webhooks/)
-* [Package Configuration and Releases Guide](package_config/)
-* [Supported Games](game_support/)
+* [Git Update Detection](update_config)
+* [Creating Releases using Webhooks](release_webhooks)
+* [Package Configuration and Releases Guide](package_config)
 
 ## Help for Specific User Ranks
 
-* [Editors](editors/)
+* [Editors](editors)
 
 ## APIs
 
-* [API](api/)
-* [OAuth2 Applications](oauth/)
-* [Prometheus Metrics](metrics/)
+* [API](api)
+* [Prometheus Metrics](metrics)

app/flatpages/help/api.md

@@ -1,14 +1,8 @@
 title: API
 
-
-## Resources
-
-* [How the Minetest client uses the API](https://github.com/minetest/contentdb/blob/master/docs/minetest_client.md)
-
-
 ## Responses and Error Handling
 
-If there is an error, the response will be JSON similar to the following with a non-200 status code:
+If there is an error, the response will be JSON similar to the following with a non-200 status code: 
 
 ```json
 {
@@ -20,33 +14,7 @@ If there is an error, the response will be JSON similar to the following with a
 Successful GET requests will return the resource's information directly as a JSON response.
 
 Other successful results will return a dictionary with `success` equaling true, and
-often other keys with information. For example:
-
-```js
-{
-    "success": true,
-    "release": {
-        /* same as returned by a GET */
-    }
-}
-```
-
-
-### Paginated Results
-
-Some API endpoints returns results in pages. The page number is specified using the `page` query argument, and
-the number of items is specified using `num`
-
-The response will be a dictionary with the following keys:
-
-* `page`: page number, integer from 1 to max
-* `per_page`: number of items per page, same as `n`
-* `page_count`: number of pages
-* `total`: total number of results
-* `urls`: dictionary containing
-    * `next`: url to next page
-    * `previous`: url to previous page
-* `items`: array of items
+often other keys with information.
 
 
 ## Authentication
@@ -55,7 +23,7 @@ Not all endpoints require authentication, but it is done using Bearer tokens:
 
 ```bash
 curl https://content.minetest.net/api/whoami/ \
-    -H "Authorization: Bearer YOURTOKEN"
+    -H "Authorization: Bearer YOURTOKEN" 
 ```
 
 Tokens can be attained by visiting [Settings > API Tokens](/user/tokens/).
@@ -64,13 +32,6 @@ Tokens can be attained by visiting [Settings > API Tokens](/user/tokens/).
     * `is_authenticated`:  True on successful API authentication
     * `username`:  Username of the user authenticated as, null otherwise.
     * 4xx status codes will be thrown on unsupported authentication type, invalid access token, or other errors.
-* DELETE `/api/delete-token/`: Deletes the currently used token.
-
-```bash
-# Logout 
-curl -X DELETE https://content.minetest.net/api/delete-token/ \
-    -H "Authorization: Bearer YOURTOKEN"
-```
 
 
 ## Packages
@@ -85,88 +46,28 @@ curl -X DELETE https://content.minetest.net/api/delete-token/ \
         * `title`: Human-readable title.
         * `name`: Technical name (needs permission if already approved).
         * `short_description`
-        * `dev_state`: One of `WIP`, `BETA`, `ACTIVELY_DEVELOPED`, `MAINTENANCE_ONLY`, `AS_IS`, `DEPRECATED`,
-            `LOOKING_FOR_MAINTAINER`.
-        * `tags`: List of [tag](#tags) names.
-        * `content_warnings`: List of [content warning](#content-warnings) names.
-        * `license`: A [license](#licenses) name.
-        * `media_license`: A [license](#licenses) name.
+        * `tags`: List of tag names, see [misc](#misc).
+        * `content_warnings`: List of content warning names, see [misc](#misc).
+        * `license`: A license name.
+        * `media_license`: A license name.          
         * `long_description`: Long markdown description.
         * `repo`: Git repo URL.
         * `website`: Website URL.
         * `issue_tracker`: Issue tracker URL.
         * `forums`: forum topic ID.
-        * `video_url`: URL to a video.
-        * `donate_url`: URL to a donation page.
-        * `game_support`: Array of game support information objects. Not currently documented, as subject to change.
-* GET `/api/packages/<author>/<name>/hypertext/`
-    * Converts the long description to [Minetest Markup Language](https://github.com/minetest/minetest/blob/master/doc/lua_api.md#markup-language)
-      to be used in a `hypertext` formspec element.
-    * Query arguments:
-        * `formspec_version`: Required, maximum supported formspec version.
-        * `include_images`: Optional, defaults to true.
-    * Returns JSON dictionary with following key:
-        * `head`: markup for suggested styling and custom tags, prepend to the body before displaying.
-        * `body`: markup for long description.
-        * `links`: dictionary of anchor name to link URL.
-        * `images`: dictionary of img name to image URL
-        * `image_tooltips`: dictionary of img name to tooltip text.
 * GET `/api/packages/<username>/<name>/dependencies/`
-    * Returns dependencies, with suggested candidates
     * If query argument `only_hard` is present, only hard deps will be returned.
-* GET `/api/dependencies/`
-    * Returns `provides` and raw dependencies for all packages.
-    * Supports [Package Queries](#package-queries)
-    * [Paginated result](#paginated-results), max 300 results per page
-    * Each item in `items` will be a dictionary with the following keys:
-        * `type`: One of `GAME`, `MOD`, `TXP`.
-        * `author`: Username of the package author.
-        * `name`: Package name.
-        * `provides`: List of technical mod names inside the package.
-        * `depends`: List of hard dependencies.
-            * Each dep will either be a modname dependency (`name`), or a
-                package dependency (`author/name`).
-        * `optional_depends`: list of optional dependencies
-            * Same as above.
-* GET `/api/packages/<username>/<name>/stats/`
-    * Returns daily stats for package, or null if there is no data.
-    * Daily date is done based on the UTC timezone.
-    * EXPERIMENTAL. This API may change without warning.
-    * Query args:
-        * `start`: start date, inclusive. Optional. Default: 2022-10-01. UTC.
-        * `end`: end date, inclusive. Optional. Default: today. UTC.
-    * An object with the following keys:
-        * `start`: start date, inclusive. Ex: 2022-10-22. M
-        * `end`: end date, inclusive. Ex: 2022-11-05.
-        * `platform_minetest`: list of integers per day.
-        * `platform_other`: list of integers per day.
-        * `reason_new`: list of integers per day.
-        * `reason_dependency`: list of integers per day.
-        * `reason_update`: list of integers per day.
-* GET `/api/package_stats/`
-    * Returns last 30 days of daily stats for _all_ packages.
-    * An object with the following keys:
-        * `start`: start date, inclusive. Ex: 2022-10-22.
-        * `end`: end date, inclusive. Ex: 2022-11-05.
-        * `package_downloads`: map from package key to list of download integers.
-
-You can download a package by building one of the two URLs:
-
-```
-https://content.minetest.net/packages/${author}/${name}/download/`
-https://content.minetest.net/packages/${author}/${name}/releases/${release}/download/`
-```
 
 Examples:
 
 ```bash
-# Edit package
-curl -X PUT https://content.minetest.net/api/packages/username/name/ \
+# Edit packages
+curl -X PUT http://localhost:5123/api/packages/username/name/ \
     -H "Authorization: Bearer YOURTOKEN" -H "Content-Type: application/json" \
     -d '{ "title": "Foo bar", "tags": ["pvp", "survival"], "license": "MIT" }'
-
+    
 # Remove website URL
-curl -X PUT https://content.minetest.net/api/packages/username/name/ \
+curl -X PUT http://localhost:5123/api/packages/username/name/ \
     -H "Authorization: Bearer YOURTOKEN" -H "Content-Type: application/json" \
     -d '{ "website": null }'
 ```
@@ -183,7 +84,6 @@ Supported query parameters:
 * `q`:  Query string.
 * `author`:  Filter by author.
 * `tag`:  Filter by tags.
-* `game`: Filter by [Game Support](/help/game_support/), ex: `Wuzzy/mineclone2`. (experimental, doesn't show items that support every game currently).
 * `random`:  When present, enable random ordering and ignore `sort`.
 * `limit`:  Return at most `limit` packages.
 * `hide`:  Hide content based on [Content Flags](/help/content_flags/).
@@ -191,18 +91,14 @@ Supported query parameters:
 * `order`:  Sort ascending (`asc`) or descending (`desc`).
 * `protocol_version`:  Only show packages supported by this Minetest protocol version.
 * `engine_version`:  Only show packages supported by this Minetest engine version, eg: `5.3.0`.
-* `fmt`:  How the response is formatted.
+* `fmt`:  How the response is formated.
     * `keys`:  author/name only.
-    * `short`:  stuff needed for the Minetest client.
+    * `short`:  stuff needed for the Minetest client. 
 
 
-### Releases
+## Releases
 
-* GET `/api/releases/` (List)
-    * Limited to 30 most recent releases.
-    * Optional arguments:
-        * `author`: Filter by author
-        * `maintainer`: Filter by maintainer
+* GET `/api/packages/<username>/<name>/releases/` (List)
     * Returns array of release dictionaries with keys:
         * `id`: release ID
         * `title`: human-readable title
@@ -212,17 +108,6 @@ Supported query parameters:
         * `downloads`: number of downloads
         * `min_minetest_version`: dict or null, minimum supported minetest version (inclusive).
         * `max_minetest_version`: dict or null, minimum supported minetest version (inclusive).
-        * `package`
-            * `author`: author username
-            * `name`: technical name
-            * `type`: `mod`, `game`, or `txp`
-* GET `/api/updates/` (Look-up table)
-    * Returns a look-up table from package key (`author/name`) to latest release id
-    * Query arguments
-        * `protocol_version`:  Only show packages supported by this Minetest protocol version.
-        * `engine_version`:  Only show packages supported by this Minetest engine version, eg: `5.3.0`.
-* GET `/api/packages/<username>/<name>/releases/` (List)
-    * Returns array of release dictionaries, see above, but without package info.
 * GET `/api/packages/<username>/<name>/releases/<id>/` (Read)
 * POST `/api/packages/<username>/<name>/releases/new/` (Create)
     * Requires authentication.
@@ -231,14 +116,13 @@ Supported query parameters:
     * For Git release creation:
         * `method`: must be `git`.
         * `ref`: (Optional) git reference, eg: `master`.
-    * For zip upload release creation:
-        * `file`: multipart file to upload, like `<input type="file" name="file">`.
-        * `commit`: (Optional) Source Git commit hash, for informational purposes.
+    * For zip upload release creation: 
+        * `file`: multipart file to upload, like `<input type=file>`.
     * You can set min and max Minetest Versions [using the content's .conf file](/help/package_config/).
 * DELETE `/api/packages/<username>/<name>/releases/<id>/` (Delete)
     * Requires authentication.
     * Deletes release.
-
+  
 Examples:
 
 ```bash
@@ -252,18 +136,13 @@ curl -X POST https://content.minetest.net/api/packages/username/name/releases/ne
     -H "Authorization: Bearer YOURTOKEN" \
     -F title="My Release" -F file=@path/to/file.zip
 
-# Create release from zip upload with commit hash
-curl -X POST https://content.minetest.net/api/packages/username/name/releases/new/ \
-    -H "Authorization: Bearer YOURTOKEN" \
-    -F title="My Release" -F commit="8ef74deec170a8ce789f6055a59d43876d16a7ea" -F file=@path/to/file.zip
-
 # Delete release
 curl -X DELETE https://content.minetest.net/api/packages/username/name/releases/3/ \
-    -H "Authorization: Bearer YOURTOKEN"
+    -H "Authorization: Bearer YOURTOKEN" 
 ```
 
 
-### Screenshots
+## Screenshots
 
 * GET `/api/packages/<username>/<name>/screenshots/` (List)
     * Returns array of screenshot dictionaries with keys:
@@ -273,7 +152,6 @@ curl -X DELETE https://content.minetest.net/api/packages/username/name/releases/
         * `url`: absolute URL to screenshot.
         * `created_at`: ISO time.
         * `order`: Number used in ordering.
-        * `is_cover_image`: true for cover image.
 * GET `/api/packages/<username>/<name>/screenshots/<id>/` (Read)
     * Returns screenshot dictionary like above.
 * POST `/api/packages/<username>/<name>/screenshots/new/` (Create)
@@ -281,224 +159,66 @@ curl -X DELETE https://content.minetest.net/api/packages/username/name/releases/
     * Body is multipart form data.
     * `title`: human-readable name for the screenshot, shown as a caption and alt text.
     * `file`: multipart file to upload, like `<input type=file>`.
-    * `is_cover_image`: set cover image to this.
 * DELETE `/api/packages/<username>/<name>/screenshots/<id>/` (Delete)
     * Requires authentication.
     * Deletes screenshot.
 * POST `/api/packages/<username>/<name>/screenshots/order/`
     * Requires authentication.
     * Body is a JSON array containing the screenshot IDs in their order.
-* POST `/api/packages/<username>/<name>/screenshots/cover-image/`
-    * Requires authentication.
-    * Body is a JSON dictionary with "cover_image" containing the screenshot ID.
-
-Currently, to get a different size of thumbnail you can replace the number in `/thumbnails/1/` with any number from 1-3.
-The resolutions returned may change in the future, and we may move to a more capable thumbnail generation.
 
 Examples:
 
 ```bash
-# Create screenshot
+# Create screenshots
 curl -X POST https://content.minetest.net/api/packages/username/name/screenshots/new/ \
     -H "Authorization: Bearer YOURTOKEN" \
     -F title="My Release" -F file=@path/to/screnshot.png
 
-# Create screenshot and set it as the cover image
-curl -X POST https://content.minetest.net/api/packages/username/name/screenshots/new/ \
-    -H "Authorization: Bearer YOURTOKEN" \
-    -F title="My Release" -F file=@path/to/screnshot.png -F is_cover_image="true"
-
 # Delete screenshot
 curl -X DELETE https://content.minetest.net/api/packages/username/name/screenshots/3/ \
-    -H "Authorization: Bearer YOURTOKEN"
-
+    -H "Authorization: Bearer YOURTOKEN" 
+    
 # Reorder screenshots
 curl -X POST https://content.minetest.net/api/packages/username/name/screenshots/order/ \
     -H "Authorization: Bearer YOURTOKEN" -H "Content-Type: application/json" \
     -d "[13, 2, 5, 7]"
-
-# Set cover image
-curl -X POST https://content.minetest.net/api/packages/username/name/screenshots/cover-image/ \
-    -H "Authorization: Bearer YOURTOKEN" -H "Content-Type: application/json" \
-    -d "{ 'cover_image': 123 }"
 ```
 
 
-### Reviews
-
-* GET `/api/packages/<username>/<name>/reviews/` (List)
-    * Returns array of review dictionaries with keys:
-        * `user`: dictionary with `display_name` and `username`.
-        * `title`: review title
-        * `comment`: the text
-        * `rating`: 1 for negative, 3 for neutral, 5 for positive
-        * `is_positive`: boolean
-        * `created_at`: iso timestamp
-        * `votes`: dictionary with `helpful` and `unhelpful`,
-* GET `/api/reviews/` (List)
-    * Returns a paginated response. This is a dictionary with `page`, `url`, and `items`.
-        * [Paginated result](#paginated-results)
-        * `items`: array of review dictionaries, like above
-            * Each review also has a `package` dictionary with `type`, `author` and `name`
-        * Ordered by created at, newest to oldest.
-    * Query arguments:
-        * `page`: page number, integer from 1 to max
-        * `n`: number of results per page, max 200
-        * `author`: filter by review author username
-        * `for_user`: filter by package author
-        * `rating`: 1 for negative, 3 for neutral, 5 for positive
-        * `is_positive`: true or false. Default: null
-        * `q`: filter by title (case-insensitive, no fulltext search)
-
-Example:
-
-```json
-[
-  {
-    "comment": "This is a really good mod!",
-    "created_at": "2021-11-24T16:18:33.764084",
-    "is_positive": true,
-    "title": "Really good",
-    "user": {
-      "display_name": "rubenwardy",
-      "username": "rubenwardy"
-    },
-    "votes": {
-      "helpful": 0,
-      "unhelpful": 0
-    }
-  }
-]
-```
-
-
-## Users
-
-* GET `/api/users/<username>/`
-    * `username`
-    * `display_name`: human-readable name to be displayed in GUIs.
-    * `rank`: ContentDB [rank](/help/ranks_permissions/).
-    * `profile_pic_url`: URL to profile picture, or null.
-    * `website_url`: URL to website, or null.
-    * `donate_url`: URL to donate page, or null.
-    * `connections`: object
-        * `github`: GitHub username, or null.
-        * `forums`: forums username, or null.
-    * `links`: object
-        * `api_packages`: URL to API to list this user's packages.
-        * `profile`: URL to the HTML profile page.
-* GET `/api/users/<username>/stats/`
-    * Returns daily stats for the user's packages, or null if there is no data.
-    * Daily date is done based on the UTC timezone.
-    * EXPERIMENTAL. This API may change without warning.
-    * Query args:
-        * `start`: start date, inclusive. Optional. Default: 2022-10-01. UTC.
-        * `end`: end date, inclusive. Optional. Default: today. UTC.
-    * A table with the following keys:
-        * `from`: start date, inclusive. Ex: 2022-10-22.
-        * `end`: end date, inclusive. Ex: 2022-11-05.
-        * `package_downloads`: map of package title to list of integers per day.
-        * `platform_minetest`: list of integers per day.
-        * `platform_other`: list of integers per day.
-        * `reason_new`: list of integers per day.
-        * `reason_dependency`: list of integers per day.
-        * `reason_update`: list of integers per day.
-
-
 ## Topics
 
-* GET `/api/topics/` ([View](/api/topics/))
-    * See [Topic Queries](#topic-queries)
+* GET `/api/topics/`:  Supports [Package Queries](#package-queries), and the following two options:
+    * `show_added`:  Show topics which exist as packages, default true.
+    * `show_discarded`:  Show topics which have been marked as outdated, default false.
 
 ### Topic Queries
 
 Example:
 
-    /api/topics/?q=mobs&type=mod&type=game
+    /api/topics/?q=mobs
 
 Supported query parameters:
 
 * `q`:  Query string.
-* `type`:  Package types (`mod`, `game`, `txp`).
-* `sort`:  Sort by (`name`, `views`, `created_at`).
+* `sort`:  Sort by (`name`, `views`, `date`).
+* `order`:  Sort ascending (`asc`) or descending (`desc`).
 * `show_added`:  Show topics that have an existing package.
 * `show_discarded`:  Show topics marked as discarded.
 * `limit`:  Return at most `limit` topics.
 
 
-## Collections
+## Misc
 
-* GET `/api/collections/`
-    * Query args: 
-        * `author`: collection author username.
-        * `package`: collections that contain the package.
-    * Returns JSON array of collection entries:
-        * `author`: author username.
-        * `name`: collection name.
-        * `title`
-        * `short_description`
-        * `created_at`: creation time in iso format.
-        * `private`: whether collection is private, boolean.
-        * `package_count`: number of packages, integer. 
-* GET `/api/collections/<username>/<name>/`
-    * Returns JSON object for collection:
-        * `author`: author username.
-        * `name`: collection name.
-        * `title`
-        * `short_description`
-        * `long_description`
-        * `created_at`: creation time in iso format.
-        * `private`: whether collection is private, boolean.
-        * `items`: array of item objects:
-            * `package`: short info about the package.
-            * `description`: custom short description.
-            * `created_at`: when the package was added to the collection.
-            * `order`: integer.
-
-## Types
-
-### Tags
-
-* GET `/api/tags/` ([View](/api/tags/)):  List of:
-    * `name`:  technical name.
-    * `title`:  human-readable title.
-    * `description`:  tag description or null.
-    * `views`: number of views of this tag.
-
-### Content Warnings
-
-* GET `/api/content_warnings/` ([View](/api/content_warnings/)):  List of:
+* GET `/api/scores/`
+    * See [Package Queries](#package-queries)
+* GET `/api/tags/`:  List of:
     * `name`:  technical name
     * `title`:  human-readable title
     * `description`:  tag description or null
-
-### Licenses
-
-* GET `/api/licenses/` ([View](/api/licenses/)):  List of:
+* GET `/api/licenses/`:  List of:
     * `name`
     * `is_foss`: whether the license is foss
-
-### Minetest Versions
-
-* GET `/api/minetest_versions/` ([View](/api/minetest_versions/))
-    * `name`: Version name.
-    * `is_dev`: boolean, is dev version.
-    * `protocol_version`: protocol version umber.
-
-
-## Misc
-
-* GET `/api/scores/` ([View](/api/scores/))
-    * See [Top Packages Algorithm](/help/top_packages/).
-    * Supports [Package Queries](#package-queries).
-    * Returns list of:
-        * `author`: package author name.
-        * `name`: package technical name.
-        * `downloads`: number of downloads.
-        * `score`: total package score.
-        * `score_reviews`: score from reviews.
-        * `score_downloads`: score from downloads.
-* GET `/api/homepage/` ([View](/api/homepage/)) - get contents of homepage.
+* GET `/api/homepage/`
     * `count`:  number of packages
     * `downloads`:  get number of downloads
     * `new`:  new packages
@@ -507,22 +227,4 @@ Supported query parameters:
     * `pop_txp`:  popular textures
     * `pop_game`:  popular games
     * `high_reviewed`:  highest reviewed
-* GET `/api/welcome/v1/` ([View](/api/welcome/v1/)) - in-menu welcome dialog. Experimental (may change without warning)
-    * `featured`: featured games
-* GET `/api/cdb_schema/` ([View](/api/cdb_schema/))
-    * Get JSON Schema of `.cdb.json`, including licenses, tags and content warnings.
-    * See [JSON Schema Reference](https://json-schema.org/).
-* POST `/api/hypertext/`
-    * Converts HTML or Markdown to [Minetest Markup Language](https://github.com/minetest/minetest/blob/master/doc/lua_api.md#markup-language)
-      to be used in a `hypertext` formspec element.
-    * Post data: HTML or Markdown as plain text.
-    * Content-Type: `text/html` or `text/markdown`.
-    * Query arguments:
-        * `formspec_version`: Required, maximum supported formspec version. Ie: 6
-        * `include_images`: Optional, defaults to true.
-    * Returns JSON dictionary with following key:
-        * `head`: markup for suggested styling and custom tags, prepend to the body before displaying.
-        * `body`: markup for long description.
-        * `links`: dictionary of anchor name to link URL.
-        * `images`: dictionary of img name to image URL
-        * `image_tooltips`: dictionary of img name to tooltip text.
+* GET `/api/minetest_versions/`

app/flatpages/help/contact_us.md

@@ -1,14 +0,0 @@
-title: Contact Us
-
-## Reports
-
-Please let us know if anything on the ContentDB violates our rules or any applicable
-laws.
-
-We take copyright violation and other offenses very seriously.
-
-<a href="/report/" class="btn btn-primary">Report</a>
-
-## Other
-
-<a href="https://rubenwardy.com/contact/" class="btn btn-primary">Contact the admin</a>

app/flatpages/help/content_flags.md

@@ -15,27 +15,20 @@ contentdb_flag_blacklist = nonfree, bad_language, drugs
 
 A flag can be:
 
-* `nonfree`: can be used to hide packages which do not qualify as
-    'free software', as defined by the Free Software Foundation.
-* `wip`: packages marked as Work in Progress 
-* `deprecated`: packages marked as Deprecated
+* `nonfree` - can be used to hide packages which do not qualify as
+	'free software', as defined by the Free Software Foundation.
 * A content warning, given below.
-* `*`: hides all content warnings.
-
-There are also two meta-flags, which are designed so that we can change how different platforms filter the package list
-without making a release.
-
-* `android_default`: currently same as `*, deprecated`. Hides all content warnings and deprecated packages
-* `desktop_default`: currently same as `deprecated`. Hides deprecated packages
+* `android_default` - meta-flag that filters out any content with a content warning.
+* `desktop_default` - meta-flag that doesn't filter anything out for now.
 
 ## Content Warnings
 
 Packages with mature content will be tagged with a content warning based
 on the content type.
 
-* `bad_language`: swearing.
-* `drugs`: drugs or alcohol.
+* `bad_language` - swearing.
+* `drugs` - drugs or alcohol.
 * `gambling`
-* `gore`: blood, etc.
-* `horror`: shocking and scary content.
-* `violence`: non-cartoon violence.
+* `gore` - blood, etc.
+* `horror` - shocking and scary content.
+* `violence` - non-cartoon violence.

app/flatpages/help/copyright.md

@@ -1,146 +0,0 @@
-title: Copyright Guide
-
-## Why should I care?
-
-Falling foul of copyright law can put you and ContentDB into legal trouble. Receiving a Cease and Desist, DMCA notice,
-or a Court Summons isn't pleasant for anyone, and can turn out to be very expensive. This page contains some
-guidance on how to ensure your content is clearly licensed and attributed to avoid these issues.
-
-Additionally, ContentDB and the forums both have some
-[requirements on the licenses](/policy_and_guidance/#41-allowed-licenses) you are allowed to use. Both require
-[free distribution and modification](/help/non_free/), allowing us to remain an open community where people can fork
-and remix each other's content. To this end, you need to make sure your content is clearly licensed.
-
-**As always, we are not lawyers and this does not constitute legal advice.**
-
-
-## What do I need to do?
-
-### Follow the licenses
-
-Make sure you understand the licenses for anything you copy into your content.
-[TL;DR Legal](https://tldrlegal.com/license/mit-license) is a good resource for quickly understanding
-licenses, although you should actually read the text as well.
-
-If you use code from other sources (such as mods or games), you'll need to make sure you follow
-their license. A common one is attribution, you should do this by adding a comment next to the
-code and crediting the author in your LICENSE file.
-
-It's sometimes fine to copy trivial/small amounts of code under fair use, but this
-is a bit of a grey area. It's better to understand the solution and rewrite it yourself.
-
-### List the sources of your media
-
-It's a good idea to create a list of all the media you used in your package, as it allows
-you to keep track of where the media came from. Media includes textures, 3d models,
-sounds, and more.
-
-You should have the following information:
-
-* File name (as found in your package)
-* Author name
-* License
-* Source (URL to the webpage, mod name, website name)
-
-It's common to do this in README.md or LICENSE.md like so:
-
-```md
-* conquer_arrow_*.png from [Simple Shooter](https://github.com/stujones11/shooter) by Stuart Jones, CC0 1.0.
-* conquer_arrow.b3d from [Simple Shooter](https://github.com/stujones11/shooter) by Stuart Jones, CC-BY-SA 3.0.
-* conquer_arrow_head.png from MTG, CC-BY-SA 3.0.
-* health_*.png from [Gauges](https://content.minetest.net/packages/Calinou/gauges/) by Calinou, CC0.
-```
-
-if you have a lot of media, then you can split it up by author like so:
-
-```md
-[Kenney](https://www.kenney.nl/assets/voxel-pack), CC0:
-
-* mymod_fence.png
-
-John Green, CC BY-SA 4.0 from [OpenGameArt](https://opengameart.org/content/tiny-16-basic):
-
-* mymod_texture.png
-* mymod_another.png
-
-Your Name, CC BY-SA 4.0:
-
-* mymod_texture_i_made.png
-```
-
-
-## Where can I get freely licensed media?
-
-* [OpenGameArt](https://opengameart.org/) - everything
-* [Kenney game assets](https://www.kenney.nl/assets) - everything
-* [Free Sound](https://freesound.org/) - sounds
-* [PolyHaven](https://polyhaven.com/) - 3d models and textures.
-* Other Minetest mods/games
-
-    Don't assume the author has correctly licensed their work.
-    Make sure they have clearly indicated the source in a list [like above](#list-the-sources-of-your-media).
-    If they didn't make it, then go to the actual source to check the license.
-
-
-## Common Situations
-
-### I made it myself, using X as a guide
-
-Copying by hand is still copying, the law doesn't distinguish this from copy+paste.
-Make your own art without copying colors or patterns from existing games/art.
-
-If you need a good set of colors, see [LOSPEC](https://lospec.com/palette-list).
-
-### I got it from Google Images / Search / the Internet
-
-You do not have permission to use things unless you are given permission to do so by the author.
-No license is exactly the same as "Copyright © All Rights Reserved".
-To use on ContentDB or the forums, you must also be given a clear license.
-
-Try searching with "creative commons" in the search term, and then clicking through to the page
-and looking for a license. Make sure the source looks trustworthy, as there are a lot of websites
-that rip off art and give an incorrect license. But it might be better to use a trusted source directly, see
-[the section above](#where-can-i-get-freely-licensed-media) for a list.
-
-### I have permission from the author
-
-You'll also need to make sure that the author gives you an explicit license for it, such as CC BY-SA 4.0.
-Permission for *you* to use it doesn't mean that *everyone* has permission to use it. A license outlines the terms of
-the permission, making things clearer and less vague.
-
-### The author said it's free for anyone to use, is that enough?
-
-No, you need an explicit license like CC0 or CC BY-SA 4.0. ContentDB does not allow custom licenses
-or public domain.
-
-### I used an AI
-
-Errrr. This is a legally untested area, we highly recommend that **you don't use AI art/code** in packages
-for that reason.
-
-For now, we haven't banned AI art/code from ContentDB. Make sure to clearly include it in your package's
-credit list (include the name of the AI tool used).
-
-Check the tools terms and conditions to see if there are any constraints on use. It looks
-like AI-generated art and code isn't copyrightable by itself, but the tool's T&Cs may still
-impose conditions.
-
-AI art/code may regurgitate copyrighted things. Make sure that you don't include the
-names of any copyrighted materials in your AI prompts, such as names of games or artists.
-
-## What does ContentDB do?
-
-The package authors and maintainers are responsible for the licenses and copyright of packages on ContentDB.
-ContentDB editors will check packages to make sure the package page's license matches up with the list of licenses
-inside the package download, but do not investigate each piece of media or line of code.
-
-If a copyright violation is reported to us, we will unlist the package and contact the author/maintainers.
-Once the problem has been fixed, the package can be restored.
-
-
-## Where can I get help?
-
-[Join](https://www.minetest.net/get-involved/) IRC, Matrix, or Discord to ask for help.
-In Discord, there are the #assets or #contentdb channels. In IRC or Matrix, you can just ask in the main channels.
-
-If your package is already on ContentDB, you can open a thread.

app/flatpages/help/editors.md

@@ -15,9 +15,8 @@ Editors should make sure they are familiar with the
 
 ## ContentDB is not a curated platform
 
-It's important to note that ContentDB isn't a curated platform - a mod doesn't need to be good
-to be accepted, but there are some minimum requirements when it comes to usefulness and other things.
-See 2.2 in the [Policy and Guidance](/policy_and_guidance/).
+It's important to note that ContentDB isn't a curated platform, but it also does have some
+requirements on minimum usefulness. See 2.2 in the [Policy and Guidance](/policy_and_guidance/).
 
 ## Editor Work Queue
 
@@ -33,26 +32,3 @@ The [Editor Work Queue](/todo/) and related pages contain useful information for
 Editors currently receive notifications for any new thread opened on a package, so that they
 know when a user is asking for help. These notifications are shown separately in the notifications
 interface, and can be configured separately in Emails and Notifications.
-
-## Crash Course to being an Editor
-
-The [Package Inclusion Policy and Guidance](/policy_and_guidance/) is our go-to resource for making decisions in 
-changes needed, similar to how lua_api.txt is the doc for modders to consult.
-
-In the [Editor console](/todo/), the two most important tabs are the Editor Work Queue and the Forum 
-Topics tab. Primarily you will be focusing on the Editor Work Queue tab, where a list of packages to review is.
-
-When you have some free time, feel free to scroll through the Forum Topics page and import mods into ContentDB.
-But don't import a mod if it's broken, outdated, not that useful, or not worth importing - click Discard instead.
-
-A simplified process for reviewing a package is as follows:
-
-1. scan the package image if present for any obvious closed source assets.
-2. if right to a name warning is present, check its validity and if the package meets 
-   the exceptions.
-3. if the forums topic missing warning is present, feel free to check it, but it's 
-   usually incorrect.
-4. check source, etc links to make sure they work and are correct.
-5. verify that the package has license file that matches what is on the contentdb fields
-6. verify that all assets and code are licensed correctly
-7. if the above steps pass, approve the package, else request changes needed from the author

app/flatpages/help/faq.md

@@ -1,64 +0,0 @@
-title: Frequently Asked Questions
-description: FAQ about using ContentDB
-
-## Users and Logins
-
-### How do I create an account?
-
-How you create an account depends on whether you have a forum account.
-
-If you have a forum account, then you'll need to prove that you are the owner of the account. This can
-be done using a GitHub account or a random string in your forum account signature.
-
-If you don't, then you can just sign up using an email address and password.
-
-GitHub can only be used to log in, not to register.
-
-<a class="btn btn-primary" href="/user/claim/">Register</a>
-
-
-### My verification email never arrived
-
-There are a number of reasons this may have happened:
-
-* Incorrect email address entered.
-* Temporary problem with ContentDB.
-* Email has been unsubscribed.
-
-**When creating an account by email:**
-If the email doesn't arrive after registering by email, then you'll need to
-try registering again in 12 hours. Unconfirmed accounts are deleted after 12 hours.
-
-**When changing your email (or it was set after a forum-based registration)**:
-then you can just set a new email in
-[Settings > Email and Notifications](/user/settings/email/).
-
-If you have previously unsubscribed this email, then ContentDB is completely prevented from sending emails to that
-address. You'll need to use a different email address, or [contact rubenwardy](https://rubenwardy.com/contact/) to
-remove your email from the blacklist.
-
-
-## Packages
-
-### How can I create releases automatically?
-
-There are a number of methods:
-
-* [Git Update Detection](/help/update_config/): ContentDB will check your Git repo daily, and create updates or send you notifications.
-* [Webhooks](/help/release_webhooks/): you can configure your Git host to send a webhook to ContentDB, and create an update immediately.
-* the [API](/help/api/): This is especially powerful when combined with CI/CD and other API endpoints.
-
-### How do I learn how to make mods and games for Minetest?
-
-You should read
-[the official Minetest Modding Book](https://rubenwardy.com/minetest_modding_book/)
-for a guide to making mods and games using Minetest.
-
-### How do I install something from here?
-
-See [Installing content](/help/installing/).
-
-
-## How do I get help?
-
-Please [contact rubenwardy](https://rubenwardy.com/contact/).

app/flatpages/help/featured.md

@@ -1,137 +0,0 @@
-title: Featured Packages
-
-<p class="alert alert-warning">
-	<b>Note:</b> This is a draft, and is likely to change
-</p>
-
-## What are Featured Packages?
-
-Featured Packages are shown at the top of the ContentDB homepage. In the future,
-featured packages may be shown inside the Minetest client.
-
-The purpose is to promote content that demonstrates a high quality of what is
-possible in Minetest. The selection should be varied, and should vary over time.
-The featured content should be content that we are comfortable recommending to
-a first time player.
-
-## How are the packages chosen?
-
-Before a package can be considered, it must fulfil the criteria in the below lists.
-There are three types of criteria:
-
-* "MUST": These must absolutely be fulfilled, no exceptions!
-* "SHOULD": Most of them should be fulfilled, if possible. Some of them can be
-  left out if there's a reason.
-* "CAN": Can be fulfilled for bonus points, they are entirely optional.
-
-For a chance to get featured, a package must fulfil all "MUST" criteria and
-ideally as many "SHOULD" criteria as possible. The more, the better. Thankfully,
-many criteria are trivial to fulfil. Note that ticking off all the boxes is not
-enough: Just because a package completes the checklist does not make it good.
-Other aspects of the package should be rated as well. See this list as a
-starting point, not as an exhaustive quality control.
-
-Editors are responsible for maintaining the list of featured packages. Authors
-can request that their package be considered by opening a thread titled
-"Feature Package" on their package. To speed things up, they should justify
-why they meet (or don't meet) the below criteria. Editors must abstain from
-voting on packages where they have a conflict of interest.
-
-A package being featured does not mean that it will be featured forever. A
-package may be unfeatured if it no longer meets the criteria, to make space for
-other packages to be featured, or for another reason.
-
-## General Requirements
-
-### General
-
-* MUST: Be 100% free and open source (as marked as Free on ContentDB).
-* MUST: Work out-of-the-box (no weird setup or settings required).
-* MUST: Be compatible with the latest stable Minetest release.
-* SHOULD: Use public source control (such as Git).
-* SHOULD: Have at least 3 reviews, and be largely positive.
-
-### Stability
-
-* MUST: Be well maintained (author is present and active).
-* MUST: Be reasonably stable, with no game-breaking or major bugs.
-* MUST: The author does not consider the package to be in an
-  experimental/development/alpha state. Beta and "unfinished" packages are fine.
-* MUST: No error messages from the engine (e.g. missing textures).
-* SHOULD: No major map breakages (including unknown nodes, corruption, loss of inventories).
-  Map breakages are a sign that the package isn't sufficiently stable.
-
-Note: Any map breakage will be excused if "disaster relief" (i.e. tools to repair the damage)
-is available.
-
-### Meta and packaging
-
-* MUST: `screenshot.png` is present and up-to-date, with a correct aspect ratio (3:2, at least 300x200).
-* MUST: Have a high resolution cover image on ContentDB (at least 1280x720 pixels).
-  It may be shown cropped to 16:9 aspect ratio, or shorter.
-* MUST: mod.conf/game.conf/texture_pack.conf present with:
-    * name (if mod or game)
-    * description
-    * dependencies (if relevant)
-    * `min_minetest_version` and `max_minetest_version` (if relevant)
-* MUST: Contain a README file and a LICENSE file. These may be `.md` or `.txt`.
-    * README files typically contain helpful links (download, manual, bugtracker, etc), and other
-      information that players or (potential) contributors may need.
-* SHOULD: All important settings are in settingtypes.txt with description.
-
-## Game-specific Requirements
-
-### Meta and packaging
-
-* MUST: Have a main menu icon and header image.
-
-### Stability
-
-* MUST: If any major setting (like `enable_damage`) is unsupported, the game must disable it
-  using `disabled_settings` in the `game.conf`, and deal with it appropriately in the code
-  (e.g. force-disable the setting, as the user may still set the setting in `minetest.conf`)
-
-### Usability
-
-* MUST: Unsupported mapgens are disabled in game.conf.
-* SHOULD: Passes the Beginner Test: A newbie to the game (but not Minetest) wouldn't get completely
-  stuck within the first 5 minutes of playing.
-* SHOULD: Have good documentation. This may include one or more of:
-    * A craftguide, or other in-game learning system
-    * A manual
-    * A wiki
-    * Something else
-
-### Gameplay
-
-* CAN: Passes the Six Hour Test (only applies to sandbox games): The game doesn't run out of new
-  content before the first 6 hours of playing.
-* CAN: Players don't feel that something in the game is "lacking".
-
-### Audiovisuals
-
-* MUST: Audiovisual design should be of good quality.
-* MUST: No obvious GUI/HUD breakages.
-* MUST: Sounds have no obvious artifacts like clicks or unintentional noise.
-* SHOULD: Graphical design is mostly consistent.
-* SHOULD: Sounds are used.
-* SHOULD: Sounds are normalized (more or less).
-
-### Quality Assurance
-
-* MUST: No flooding the console/log file with warnings.
-* MUST: No duplicate crafting recipes.
-* MUST: Highly experimental game features are disabled by default.
-* MUST: Experimental game features are clearly marked as such.
-* SHOULD: No unknown nodes/items/objects appear.
-* SHOULD: No dependency on legacy API calls.
-* SHOULD: No console warnings.
-
-### Writing
-
-* MUST: All items that can be obtained in normal gameplay have `description` set (whether in the definition or meta).
-* MUST: Game is not littered with typos or bad grammar (a few typos are OK but should be fixed, when found).
-* SHOULD: All items have unique names (items which disguise themselves as another item are exempt).
-* SHOULD: The writing style of all item names is grammatical and consistent.
-* SHOULD: Descriptions of things convey useful and meaningful information (if applicable).
-* CAN: Text is written in clear and (if possible) simple language.

app/flatpages/help/game_support.md

@@ -1,56 +0,0 @@
-title: Supported Games
-
-<p class="alert alert-warning">
-    This feature is experimental
-</p>
-
-## Why?
-
-The supported/compatible games feature allows mods to specify the games that
-they work with, which improves user experience.
-
-
-## Support sources
-
-### mod.conf / texture_pack.conf
-
-You can use `supported_games` to specify games that your mod/modpack/texture
-pack is compatible with.
-
-You can use `unsupported_games` to specify games that your package doesn't work
-with, which is useful for overriding ContentDB's automatic detection.
-
-Both of these are comma-separated lists of game technical ids. Any `_game`
-suffixes are ignored, just like in Minetest.
-
-    supported_games = minetest_game, repixture
-    unsupported_games = lordofthetest, nodecore, whynot
-
-If your package supports all games by default, you can put "*" in
-supported_games. You can still use unsupported_games to mark games as
-unsupported. You can also specify games that you've tested in supported_games.
-
-    # Should work with all games but I've only tested using Minetest Game:
-    supported_games = *, minetest_game
-
-    # But doesn't work in capturetheflag
-    unsupported_game = capturetheflag
-
-### Dependencies
-
-ContentDB will analyse hard dependencies and work out which games a mod
-supports.
-
-This uses a recursive algorithm that works out whether a dependency can be
-installed independently, or if it requires a certain game.
-
-### On ContentDB
-
-You can define supported games on ContentDB, but using .conf is recommended
-instead.
-
-
-## Combining all the sources
-
-.conf will override anything ContentDB detects. The manual override on ContentDB
-overrides .conf and dependencies.

app/flatpages/help/installing.md

@@ -1,89 +0,0 @@
-title: How to install mods, games, and texture packs
-description: A guide to installing mods, games, and texture packs in Minetest.
-
-## Installing from the main menu (recommended)
-
-### Install
-
-1. Open the mainmenu
-2. Go to the Content tab and click "Browse online content".
-   If you don't see this, then you need to update Minetest to v5.
-3. Search for the package you want to install, and click "Install". 
-4. When installing a mod, you may be shown a dialog about dependencies here.
-   Make sure the base game dropdown box is correct, and then click "Install".
-
-<div class="row mt-5">
-  <div class="col-md-6">
-    <figure>
-      <a href="/static/installing_content_tab.png">
-        <img class="w-100" src="/static/installing_content_tab.png" alt="Screenshot of the content tab in minetest">
-      </a>
-      <figcaption class="text-muted ps-1">
-        1. Click Browser Online Content in the content tab.
-      </figcaption>
-    </figure>
-  </div>
-  <div class="col-md-6">
-    <figure>
-      <a href="/static/installing_cdb_dialog.png">
-        <img class="w-100" src="/static/installing_cdb_dialog.png" alt="Screenshot of the content tab in minetest">
-      </a>
-      <figcaption class="text-muted ps-1">
-        2. Search for the package and click "Install".
-      </figcaption>
-    </figure>
-  </div>
-</div>
-
-Troubleshooting:
-
-* I can't find it in the ContentDB dialog (Browse online content)
-    * Make sure that you're on the latest version of Minetest.
-    * Are you using Android? Packages with content warnings are hidden by default on android,
-      you can show them by removing `android_default` from the `contentdb_flag_blacklist` setting.
-    * Does the webpage show "Non-free" warnings? Non-free content is hidden by default from all clients,
-      you can show them by removing `nonfree` from the `contentdb_flag_blacklist` setting.
-* It says "required dependencies could not be found"
-    * Make sure you're using the correct "Base Game". A lot of packages only work with certain games, you can look
-      at "Compatible Games" on the web page to see which.
-
-### Enable in Select Mods
-
-1. Mods: Enable the content using "Select Mods" when selecting a world.
-2. Games: choose a game when making a world.
-3. Texture packs: Content > Select pack > Click enable.   
-
-
-<div class="row mt-5">
-  <div class="col-md-6">
-    <figure>
-      <a href="/static/installing_select_mods.png">
-        <img class="w-100" src="/static/installing_select_mods.png" alt="Screenshot of Select Mods in Minetest">
-      </a>
-      <figcaption class="text-muted ps-1">
-        Enable mods using the Select Mods dialog.
-      </figcaption>
-    </figure>
-  </div>
-</div>
-
-## Installing using the command line
-
-### Git clone
-
-1. Install git
-2. Find the package on ContentDB and copy "source" link.
-3. Find the user data directory.
-   In 5.4.0 and above, you can click "Open user data directory" in the Credits tab.
-   Otherwise:
-     * Windows: whereever you extracted or installed Minetest to.
-     * Linux: usually `~/.minetest/`
-4. Open or create the folder for the type of content (`mods`, `games`, or `textures`)
-5. Git clone there
-6. For mods, make sure to install any required dependencies.
-
-### Enable
-
-* Mods: Edit world.mt in the world's folder to contain `load_file_MODNAME = true`
-* Games: Use `--game` or edit game_id in world.mt.
-* Texture packs: change the `texture_path` setting to the texture pack absolute path.

app/flatpages/help/metrics.md

@@ -6,14 +6,7 @@ title: Prometheus Metrics
 dimensional data model, flexible query language, efficient time series database
 and modern alerting approach".
 
-Prometheus Metrics can be accessed at [/metrics](/metrics), or you can view them
-on the Grafana instance below.
-
-<p>
-    <a class="btn btn-primary" href="https://monitor.rubenwardy.com/d/3ELzFy3Wz/contentdb">
-        View ContentDB on Grafana
-    </a>
-</p>
+Prometheus Metrics can be accessed at [/metrics](/metrics).
 
 ## Metrics
 

app/flatpages/help/non_free.md

@@ -55,7 +55,7 @@ Here's a quick summary related to Minetest content:
 Non-free packages are hidden in the client by default, partly in order to comply
 with the rules of various Linux distributions.
 
-Users can opt in to showing non-free software, if they wish:
+Users can opt-in to showing non-free software, if they wish:
 
 1. In the main menu, go to Settings > All settings
 2. Search for "ContentDB Flag Blacklist".
@@ -66,8 +66,8 @@ Users can opt in to showing non-free software, if they wish:
 	<figcaption class="figure-caption">Screenshot of the ContentDB Flag Blacklist setting</figcaption>
 </figure>
 
-The [`platform_default` flag](/help/content_flags/) is used to control what content
-each platforms shows. It doesn't hide anything on Desktop, but hides all mature
-content on Android. You may wish to remove all text from that setting completely, 
-leaving it blank. See [Content Warnings](/help/content_flags/#content-warnings)
-for information on mature content.
+In the future, [the `platform_default` flag](/help/content_flags/) will be used to control what content
+each platforms shows - Android is significantly stricter about mature content.
+You may wish to remove all text from that setting completely, leaving it blank,
+if you wish to view all content when this happens. Currently, [mature content is
+not permitted on ContentDB](/policy_and_guidance/).

app/flatpages/help/oauth.md

@@ -1,106 +0,0 @@
-title: OAuth2 API
-
-<p class="alert alert-warning">
-    The OAuth2 applications API is currently experimental, and may break without notice.
-</p>
-
-ContentDB allows you to create an OAuth2 Application and obtain access tokens
-for users.
-
-
-## Create an OAuth2 Client
-
-Go to Settings > [OAuth2 Applications](/user/apps/) > Create
-
-
-## Obtaining access tokens
-
-ContentDB supports the Authorization Code OAuth2 method.
-
-### Authorize
-
-Get the user to open the following URL in a web browser:
-
-```
-https://content.minetest.net/oauth/authorize/
-    ?response_type=code
-    &client_id={CLIENT_ID}
-    &redirect_uri={REDIRECT_URL}
-```
-
-The redirect_url must much the value set in your oauth client. Make sure to URL encode it.
-ContentDB also supports `state`.
-
-Afterwards, the user will be redirected to your callback URL.
-If the user accepts the authorization, you'll receive an authorization code (`code`).
-Otherwise, the redirect_url will not be modified.
-
-For example, with `REDIRECT_URL` set as `https://example.com/callback/`:
-
-* If the user accepts: `https://example.com/callback/?code=abcdef`
-* If the user cancels: `https://example.com/callback/`
-
-### Exchange auth code for access token
-
-Next, you'll need to exchange the auth for an access token.
-
-Do this by making a POST request to the `/oauth/token/` API:
-
-```bash
-curl -X POST https://content.minetest.net/oauth/token/ \
-    -F grant_type=authorization_code \
-    -F client_id="CLIENT_ID" \
-    -F client_secret="CLIENT_SECRET" \
-    -F code="abcdef" 
-```
-
-<p class="alert alert-warning">
-    <i class="fas fa-exclamation-circle me-2"></i>
-    You should make this request on a server to prevent the user
-    from getting access to your client secret.
-</p>
-
-If successful, you'll receive:
-
-```json
-{
-    "access_token": "access_token",
-    "token_type": "Bearer"
-}
-```
-
-If there's an error, you'll receive a standard API error message:
-
-```json
-{
-    "success": false,
-    "error": "The error message"
-}
-```
-
-Possible errors:
-
-* Unsupported grant_type, only authorization_code is supported
-* Missing client_id
-* Missing client_secret
-* Missing code
-* client_id and/or client_secret is incorrect
-* Incorrect code. It may have already been redeemed
-
-### Check access token
-
-Next, you should check the access token works by getting the user information:
-
-```bash
-curl https://content.minetest.net/api/whoami/ \
-    -H "Authorization: Bearer YOURTOKEN"
-```
-
-
-## Scopes
-
-* (no scope) - public data only
-* `user:email`: read user email
-* `package`: write access to packages
-* `package:release`: create and delete releases
-* `package:screenshot`: create, edit, delete screenshots

app/flatpages/help/package_config.md

@@ -19,26 +19,15 @@ The filename of the `.conf` file depends on the content type:
 * `game.conf` for games.
 * `texture_pack.conf` for texture packs.
 
-The `.conf` uses a key-value format, separated using equals.
-
-Here's a simple example of `mod.conf`, `modpack.conf`, or `texture_pack.conf`:
+The `.conf` uses a key-value format, separated using equals. Here's a simple example:
 
 	name = mymod
-	title = My Mod
 	description = A short description to show in the client.
 
-Here's a simple example of `game.conf`:
-
-	title = My Game
-	description = A short description to show in the client.
-
-Note that you should not specify `name` in game.conf.
-
 ### Understood values
 
 ContentDB understands the following information:
 
-* `title` - A human-readable title.
 * `description` - A short description to show in the client.
 * `depends` - Comma-separated hard dependencies.
 * `optional_depends` - Comma-separated soft dependencies.
@@ -48,8 +37,6 @@ ContentDB understands the following information:
 and for mods only:
 
 * `name` - the mod technical name.
-* `supported_games` - List of supported game technical names.
-* `unsupported_games` - List of not supported game technical names. Useful to override game support detection.
 
 
 ## .cdb.json
@@ -63,8 +50,6 @@ It should be a JSON dictionary with one or more of the following optional keys:
 * `title`: Human-readable title.
 * `name`: Technical name (needs permission if already approved).
 * `short_description`
-* `dev_state`: One of `WIP`, `BETA`, `ACTIVELY_DEVELOPED`, `MAINTENANCE_ONLY`, `AS_IS`, `DEPRECATED`,
-    `LOOKING_FOR_MAINTAINER`.
 * `tags`: List of tag names, see [/api/tags/](/api/tags/).
 * `content_warnings`: List of content warning names, see [/api/content_warnings/](/api/content_warnings/).
 * `license`: A license name, see [/api/licenses/](/api/licenses/).
@@ -74,10 +59,8 @@ It should be a JSON dictionary with one or more of the following optional keys:
 * `website`: Website URL.
 * `issue_tracker`: Issue tracker URL.
 * `forums`: forum topic ID.
-* `video_url`: URL to a video.
-* `donate_url`: URL to a donation page.
 
-Use `null` or `[]` to unset fields where relevant.
+Use `null` to unset fields where relevant.
 
 Example:
 

app/flatpages/help/ranks_permissions.md

@@ -2,11 +2,10 @@ title: Ranks and Permissions
 
 ## Overview
 
-* **New Members** - mostly untrusted, cannot change package metadata or publish releases without approval.
-* **Members** - Trusted to change the metadata of their own packages', but cannot approve their own packages.
+* **New Members** - mostly untrusted, cannot change package meta data or publish releases without approval.
+* **Members** - Trusted to change the meta data of their own packages', but cannot approve their own packages.
 * **Trusted Members** - Same as above, but can approve their own releases.
-* **Approvers** - Responsible for approving new packages, screenshots, and releases.
-* **Editors** - Same as above, and can edit any package or release.
+* **Editors** - Trusted to edit any package or release, and also responsible for approving new packages.
 * **Moderators** - Same as above, but can manage users.
 * **Admins** - Full access.
 
@@ -19,7 +18,6 @@ title: Ranks and Permissions
 			<th colspan=2 class="NEW_MEMBER">New Member</th>
 			<th colspan=2 class="MEMBER">Member</th>
 			<th colspan=2 class="TRUSTED_MEMBER">Trusted</th>
-            <th colspan=2 class="APPROVER">Approver</th>
 			<th colspan=2 class="EDITOR">Editor</th>
 			<th colspan=2 class="MODERATOR">Moderator</th>
 			<th colspan=2 class="ADMIN">Admin</th>
@@ -38,8 +36,6 @@ title: Ranks and Permissions
 			<th>N</th>
 			<th>Y</th>
 			<th>N</th>
-			<th>Y</th>
-			<th>N</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -51,8 +47,6 @@ title: Ranks and Permissions
 			<td></td>
 			<td>✓</td> <!-- trusted member -->
 			<td></td>
-			<td>✓</td> <!-- approver -->
-			<td></td>
 			<td>✓</td> <!-- editor -->
 			<td>✓</td>
 			<td>✓</td> <!-- moderator -->
@@ -68,8 +62,6 @@ title: Ranks and Permissions
 			<td></td>
 			<td></td> <!-- trusted member -->
 			<td></td>
-			<td>✓</td> <!-- approver -->
-			<td>✓</td>
 			<td>✓</td> <!-- editor -->
 			<td>✓</td>
 			<td>✓</td> <!-- moderator -->
@@ -85,8 +77,6 @@ title: Ranks and Permissions
 			<td></td>
 			<td>✓</td> <!-- trusted member -->
 			<td></td>
-			<td>✓</td> <!-- approver -->
-			<td>✓</td>
 			<td>✓</td> <!-- editor -->
 			<td>✓</td>
 			<td>✓</td> <!-- moderator -->
@@ -102,8 +92,6 @@ title: Ranks and Permissions
 			<td></td>
 			<td>✓</td> <!-- trusted member -->
 			<td></td>
-			<td>✓</td> <!-- approver -->
-			<td></td>
 			<td>✓</td> <!-- editor -->
 			<td>✓</td>
 			<td>✓</td> <!-- moderator -->
@@ -119,10 +107,8 @@ title: Ranks and Permissions
 			<td></td>
 			<td>✓</td> <!-- trusted member -->
 			<td></td>
-			<td>✓</td> <!-- approver -->
-			<td></td>
 			<td>✓</td> <!-- editor -->
-			<td>✓</td>
+			<td></td>
 			<td>✓</td> <!-- moderator -->
 			<td>✓</td>
 			<td>✓</td> <!-- admin -->
@@ -136,8 +122,6 @@ title: Ranks and Permissions
 			<td></td>
 			<td>✓</td> <!-- trusted member -->
 			<td></td>
-			<td>✓</td> <!-- approver -->
-			<td></td>
 			<td>✓</td> <!-- editor -->
 			<td>✓</td>
 			<td>✓</td> <!-- moderator -->
@@ -153,8 +137,6 @@ title: Ranks and Permissions
 			<td></td>
 			<td>✓</td> <!-- trusted member -->
 			<td></td>
-			<td>✓</td> <!-- approver -->
-			<td>✓</td>
 			<td>✓</td> <!-- editor -->
 			<td>✓</td>
 			<td>✓</td> <!-- moderator -->
@@ -170,8 +152,6 @@ title: Ranks and Permissions
 			<td></td>
 			<td>✓</td> <!-- trusted member -->
 			<td></td>
-			<td>✓</td> <!-- approver -->
-			<td></td>
 			<td>✓</td> <!-- editor -->
 			<td>✓</td>
 			<td>✓</td> <!-- moderator -->
@@ -187,8 +167,6 @@ title: Ranks and Permissions
 			<td></td>
 			<td>✓</td> <!-- trusted member -->
 			<td></td>
-			<td>✓</td> <!-- approver -->
-			<td>✓</td>
 			<td>✓</td> <!-- editor -->
 			<td>✓</td>
 			<td>✓</td> <!-- moderator -->
@@ -204,8 +182,6 @@ title: Ranks and Permissions
 			<td></td>
 			<td></td> <!-- trusted member -->
 			<td></td>
-			<td></td> <!-- approver -->
-			<td></td>
 			<td></td> <!-- editor -->
 			<td></td>
 			<td></td> <!-- moderator -->
@@ -221,8 +197,6 @@ title: Ranks and Permissions
 			<td></td>
 			<td>✓</td> <!-- trusted member -->
 			<td></td>
-			<td>✓</td> <!-- approver -->
-			<td>✓</td>
 			<td>✓</td> <!-- editor -->
 			<td>✓</td>
 			<td>✓</td> <!-- moderator -->
@@ -238,8 +212,6 @@ title: Ranks and Permissions
 			<td></td>
 			<td>✓</td> <!-- trusted member -->
 			<td></td>
-			<td>✓</td> <!-- approver -->
-			<td></td>
 			<td>✓</td> <!-- editor -->
 			<td></td>
 			<td>✓</td> <!-- moderator -->
@@ -255,8 +227,6 @@ title: Ranks and Permissions
 			<td></td>
 			<td>✓</td> <!-- trusted member -->
 			<td></td>
-			<td>✓</td> <!-- approver -->
-			<td></td>
 			<td>✓</td> <!-- editor -->
 			<td></td>
 			<td>✓</td> <!-- moderator -->
@@ -266,14 +236,12 @@ title: Ranks and Permissions
 		</tr>
 		<tr>
 			<td>Create Token</td>
-			<td>✓</td> <!-- new -->
+			<td></td> <!-- new -->
 			<td></td>
 			<td>✓</td> <!-- member -->
 			<td></td>
 			<td>✓</td> <!-- trusted member -->
 			<td></td>
-			<td>✓</td> <!-- approver -->
-			<td></td>
 			<td>✓</td> <!-- editor -->
 			<td></td>
 			<td>✓</td> <!-- moderator -->
@@ -289,12 +257,10 @@ title: Ranks and Permissions
 			<td></td>
 			<td></td> <!-- trusted member -->
 			<td></td>
-			<td></td> <!-- approver -->
-			<td></td>
 			<td></td> <!-- editor -->
 			<td></td>
-			<th>✓<sup>2</sup></th> <!-- moderator -->
-			<th>✓<sup>1</sup><sup>2</sup></th>
+			<th>✓<sup>3</sup></th> <!-- moderator -->
+			<th>✓<sup>2</sup><sup>3</sup></th>
 			<td>✓</td> <!-- admin -->
 			<td>✓</td>
 		</tr>
@@ -302,5 +268,5 @@ title: Ranks and Permissions
 </table>
 
 
-1. Target user cannot be an admin.
-2 Cannot set user to a higher rank than themselves.
+2. Target user cannot be an admin.
+3. Cannot set user to a higher rank than themselves.

app/flatpages/help/release_webhooks.md

@@ -6,7 +6,7 @@ A webhook is a notification from one service to another. Put simply, a webhook
 is used to notify ContentDB that the git repository has changed.
 
 ContentDB offers the ability to automatically create releases using webhooks
-from either GitHub or GitLab. If you're not using either of those services,
+from either Github or Gitlab. If you're not using either of those services,
 you can also use the [API](../api) to create releases.
 
 ContentDB also offers the ability to poll a Git repo and check for updates
@@ -20,11 +20,6 @@ The process is as follows:
 3. The git host posts a webhook notification to ContentDB, using the API token assigned to it.
 4. ContentDB checks the API token and issues a new release.
 
-<p class="alert alert-warning">
-    "New commit" or "push" based webhooks will currently only work on branches named `master` or
-    `main`.
-</p>
-
 ## Setting up
 
 ### GitHub
@@ -54,10 +49,9 @@ The process is as follows:
       choose "Tag push events".
 8. Add webhook.
 
-## Configuring Release Creation
+## Configuring
 
 See the [Package Configuration and Releases Guide](/help/package_config/) for
 documentation on configuring the release creation.
-
-From the Git repository, you can set the min/max Minetest versions, which files are included,
-and update the package meta.
+You can set the min/max Minetest version from the Git repository, and also
+configure what files are included.

app/flatpages/help/reporting.md

@@ -0,0 +1,8 @@
+title: Reporting Content
+
+Please let us know if anything on the ContentDB violates our rules or any applicable
+laws.
+
+We take copyright violation and other offenses very seriously.
+
+<a href="https://rubenwardy.com/contact/" class="btn btn-success">Contact</a>

app/flatpages/help/wtfpl.md

@@ -6,17 +6,17 @@ toc: False
 
 	Please reconsider the choice of WTFPL as a license.
 
+	<script src="/static/jquery.min.js"></script>
 	<script>
 		// @author rubenwardy
 		// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later
 
 		var params = new URLSearchParams(location.search);
-		var r = params.get("r");
-		if (r) {
+		var r      = params.get("r");
+		if (r)
 			document.write("<a class='alert_right button' href='" + r + "'>Okay</a>");
-		} else {
-			document.getElementById("warning").style.display = "none";
-        }
+		else
+			$("#warning").hide();
 	</script>
 </div>
 

app/flatpages/policy_and_guidance.md

@@ -11,8 +11,6 @@ the listings and to combat abuse.
 * **Don't use the name of another mod unless your mod is a fork or reimplementation.** <sup>3</sup>
 * **Licenses must allow derivatives, redistribution, and must not discriminate.** <sup>4</sup>
 * **Don't put promotions or advertisements in any package metadata.** <sup>5</sup>
-* **Don't manipulate package placement using reviews or downloads.** <sup>6</sup>
-* **Screenshots must not be misleading.** <sup>7</sup>
 * **The ContentDB admin reserves the right to remove packages for any reason**,
   including ones not covered by this document, and to ban users who abuse
   this service. <sup>1</sup>
@@ -29,11 +27,15 @@ including ones not covered by this document, and to ban users who abuse this ser
 ### 2.1. Acceptable Content
 
 Sexually-orientated content is not permitted.
-If in doubt at what this means, [contact us by raising a report](/report/).
+If in doubt at what this means, [contact us by raising a report](/help/reporting/).
 
 Mature content is permitted providing that it is labelled correctly.
 See [Content Flags](/help/content_flags/).
 
+The submission of malware is strictly prohibited. This includes software that
+does not do as it advertises, for example, if it posts telemetry without stating
+clearly that it does in the package meta.
+
 ### 2.2. State of Completion
 
 ContentDB should only currently contain playable content - content which is
@@ -44,9 +46,6 @@ but still has value. Note that this doesn't mean that you should add a thing
 you started working on yesterday, it's worth adding all the basic stuff to
 make your package useful.
 
-You should make sure to mark Work in Progress stuff as such in the "maintenance status" column,
-as this will help advise players.
-
 Adding non-player facing mods, such as libraries and server tools, is perfectly fine
 and encouraged. ContentDB isn't just for player-facing things, and adding
 libraries allows them to be installed when a mod depends on it.
@@ -87,8 +86,7 @@ reimplementation of the mod that owns the name.
 ### 4.1. Allowed Licenses
 
 Please ensure that you correctly credit any resources (code, assets, or otherwise)
-that you have used in your package. For help on doing copyright correctly, see
-the [Copyright help page](/help/copyright/).
+that you have used in your package.
 
 **The use of licenses that do not allow derivatives or redistribution is not
 permitted. This includes CC-ND (No-Derivatives) and lots of closed source licenses.
@@ -98,8 +96,7 @@ of the content on servers or singleplayer is also not permitted.**
 However, closed sourced licenses are allowed if they allow the above.
 
 If the license you use is not on the list then please select "Other", and we'll
-get around to adding it. We tend to reject custom/untested licenses, and 
-reserve the right to decide whether a license should be included. 
+get around to adding it.
 
 Please note that the definitions of "free" and "non-free" is the same as that
 of the [Free Software Foundation](https://www.gnu.org/philosophy/free-sw.en.html).
@@ -127,7 +124,7 @@ Public domain is not a valid license in many countries, please use CC0 or MIT in
 
 ## 5. Promotions and Advertisements (inc. asking for donations)
 
-You may not place any promotions or advertisements in any metadata including
+You may not place any promotions or advertisements in any meta data including
 screenshots. This includes asking for donations, promoting online shops,
 or linking to personal websites and social media. Please instead use the
 fields provided on your user profile page to place links to websites and
@@ -137,66 +134,6 @@ ContentDB is for the community. We may remove any promotions if we feel that
 they're inappropriate.
 
 
-## 6. Reviews and Package Score
+## 6. Reporting Violations
 
-You may invite players to review your package(s). One way to do this is by sharing the link found in the
-"Share and Badges" page of the package's settings.
-
-You must not require anyone to review a package. You must not promise or provide incentives for reviewing a package,
-including but not limited to monetary rewards, in-game items, features, and/or privileges.
-You may give a cosmetic-only role or badge to those who review your package - this must not be tied to the content or
-rating of the review.
-
-You must not attempt to unfairly manipulate your package's ranking, whether by reviews or any other method.
-Doing so may result in temporary or permanent suspension from ContentDB.
-
-
-## 7. Screenshots
-
-1.  **Screenshots must not violate copyright.** You should have the rights to the
-    screenshot.
-
-2.  **Screenshots must depict the actual content of the package in some way, and
-    not be misleading.**
-
-    Do not use idealized mockups or blender concept renders if they do not
-    accurately reflect in-game appearance.
-
-    Content in screenshots that is prominently displayed or "focal" should be
-    either present in, or interact with, the package in some way. These can
-    include things in other packages if they have a dependency relationship
-    (either way), or if the submitted package in some way enhances, extends, or
-    alters that content.
-
-    Unrelated package content can be allowed to show what the package content
-    will look like in a typical/realistic game scene, but should be "in the
-    background" only as far as possible.
-
-3.  **Screenshots must only contain content appropriate for the Content Warnings of
-    the package.**
-
-4.  **Screenshots should be MOSTLY in-game screenshots, if applicable.** Some
-    alterations on in-game screenshots are okay, such as collages, added text,
-    some reasonable compositing.
-
-    Don't just use one of the textures from the package; show it in-situ as it
-    actually looks in the game.
-
-5.  **Packages should have a screenshot when reasonably applicable.**
-
-6.  **Screenshots should be of reasonable dimensions.** We recommend using 1920x1080.
-
-
-## 8. Security
-
-The submission of malware is strictly prohibited. This includes software that
-does not do as it advertises, for example, if it posts telemetry without stating
-clearly that it does in the package meta.
-
-Packages must not ask that users disable mod security (`secure.enable_security`).
-Instead, they should use the insecure environment API.
-
-
-## 9. Reporting Violations
-
-Please click "Report" on the package page.
+See the [Reporting Content](/help/reporting/) page.

app/flatpages/privacy_policy.md

@@ -1,8 +1,5 @@
 title: Privacy Policy
 
-Last Updated: 2022-01-23
-([View updates](https://github.com/minetest/contentdb/commits/master/app/flatpages/privacy_policy.md))
-
 ## What Information is Collected
 
 **All users:**
@@ -12,14 +9,13 @@ Last Updated: 2022-01-23
 	* IP address
 	* Page URL
 	* Response status code
-* Preferred language/locale. This defaults to the browser's locale, but can be changed by the user
 
 **With an account:**
 
 * Email address
 * Passwords (hashed and salted using BCrypt)
 * Profile information, such as website URLs and donation URLs
-* Comments, threads, and reviews
+* Comments and threads
 * Audit log actions (such as edits and logins) and their time stamps
 
 ContentDB collects usernames of content creators from the forums,
@@ -34,12 +30,10 @@ Please avoid giving other personal information as we do not want it.
 
 * Logged HTTP requests may be used for debugging ContentDB.
 * Email addresses are used to:
-    * Provide essential system messages, such as password resets and privacy policy updates.
+    * Provide essential system messages, such as password resets.
     * Send notifications - the user may configure this to their needs, including opting out.
-    * The admin may use ContentDB to send emails when they need to contact a user.
 * Passwords are used to authenticate the user.
-* The audit log is used to record actions that may be harmful.
-* Preferred language/locale is used to translate emails and the ContentDB interface.
+* The audit log is used to record actions that may be harmful
 * Other information is displayed as part of ContentDB's service.
 
 ## Who has access
@@ -49,7 +43,7 @@ Please avoid giving other personal information as we do not want it.
 * Encrypted backups may be shared with selected Minetest staff members (moderators + core devs).
   The keys and the backups themselves are given to different people,
   requiring at least two staff members to read a backup.
-* Email addresses are visible to moderators and the admin.
+* Emails are visible to moderators and the admin.
   They have access to assist users, and they are not permitted to share email addresses.
 * Hashing protects passwords from being read whilst stored in the database or in backups.
 * Profile information is public, including URLs and linked accounts.
@@ -58,12 +52,11 @@ Please avoid giving other personal information as we do not want it.
 * The complete audit log is visible to moderators.
   Users may see their own audit log actions on their account settings page.
   Owners, maintainers, and editors may be able to see the actions on a package in the future.
-* Preferred language can only be viewed by this with access to the database or a backup.
 * We may be required to share information with law enforcement.
 
 ## Location
 
-The ContentDB production server is currently located in Germany.
+The ContentDB production server is currently located in Canada.
 Backups are stored in the UK.
 Encrypted backups may be stored in other countries, such as the US or EU.
 
@@ -79,7 +72,7 @@ requested. See below.
 
 ## Removal Requests
 
-Please [raise a report](/report/?anon=0) if you
+Please [raise a report](https://content.minetest.net/help/reporting/) if you
 wish to remove your personal information.
 
 ContentDB keeps a record of each username and forum topic on the forums,

app/flatpages/rules.md

@@ -1,15 +0,0 @@
-title: Rules
-
-The following are the rules for user behaviour on ContentDB, including reviews,
-threads, comments, and profiles. For packages, see the
-[Package Inclusion Policy](/policy_and_guidance/).
-
-1. **Be respectful:** attacks towards any person or group, slurs,
-    trolling/baiting, and other toxic behavior are not welcome.
-2. **Assume good faith:** communication over the Internet is hard, try to assume
-    good faith when eg: responding to reviews.
-3. **No sexual content** and ensure you keep discussion appropriate given the
-    package's [content warnings](/help/content_flags/).
-
-You can report things by clicking [report](/report/) in the footer of pages you
-want to report.

app/logic/game_support.py

@@ -1,177 +0,0 @@
-# ContentDB
-# Copyright (C) 2022 rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-
-import sys
-from typing import List, Dict
-
-import sqlalchemy.orm
-
-from app.logic.LogicError import LogicError
-from app.models import Package, MetaPackage, PackageType, PackageState, PackageGameSupport
-
-"""
-get_game_support(package):
-	if package is a game:
-		return [ package ]
-
-	for all hard dependencies:
-		support = support AND get_meta_package_support(dep)
-
-	return support
-
-get_meta_package_support(meta):
-	for package implementing mod name:
-		support = support OR get_game_support(package)
-
-	return support
-"""
-
-
-minetest_game_mods = {
-	"beds", "boats", "bucket", "carts", "default", "dungeon_loot", "env_sounds", "fire", "flowers",
-	"give_initial_stuff", "map", "player_api", "sethome", "spawn", "tnt", "walls", "wool",
-	"binoculars", "bones", "butterflies", "creative", "doors", "dye", "farming", "fireflies", "game_commands",
-	"keys", "mtg_craftguide", "screwdriver", "sfinv", "stairs", "vessels", "weather", "xpanes",
-}
-
-
-mtg_mod_blacklist = {
-	"pacman", "tutorial", "runorfall", "realtest_mt5", "mevo", "xaenvironment",
-	"survivethedays", "holidayhorrors",
-}
-
-
-class GameSupportResolver:
-	session: sqlalchemy.orm.Session
-	checked_packages = set()
-	checked_modnames = set()
-	resolved_packages: Dict[int, set[int]] = {}
-	resolved_modnames: Dict[int, set[int]] = {}
-
-	def __init__(self, session):
-		self.session = session
-
-	def resolve_for_meta_package(self, meta: MetaPackage, history: List[str]) -> set[int]:
-		print(f"Resolving for {meta.name}", file=sys.stderr)
-
-		key = meta.name
-		if key in self.resolved_modnames:
-			return self.resolved_modnames.get(key)
-
-		if key in self.checked_modnames:
-			print(f"Error, cycle found: {','.join(history)}", file=sys.stderr)
-			return set()
-
-		self.checked_modnames.add(key)
-
-		retval = set()
-
-		for package in meta.packages:
-			if package.state != PackageState.APPROVED:
-				continue
-
-			if meta.name in minetest_game_mods and package.name in mtg_mod_blacklist:
-				continue
-
-			ret = self.resolve(package, history)
-			if len(ret) == 0:
-				retval = set()
-				break
-
-			retval.update(ret)
-
-		self.resolved_modnames[key] = retval
-		return retval
-
-	def resolve(self, package: Package, history: List[str]) -> set[int]:
-		key: int = package.id
-		print(f"Resolving for {key}", file=sys.stderr)
-
-		history = history.copy()
-		history.append(package.get_id())
-
-		if package.type == PackageType.GAME:
-			return {package.id}
-
-		if key in self.resolved_packages:
-			return self.resolved_packages.get(key)
-
-		if key in self.checked_packages:
-			print(f"Error, cycle found: {','.join(history)}", file=sys.stderr)
-			return set()
-
-		self.checked_packages.add(key)
-
-		if package.type != PackageType.MOD:
-			raise LogicError(500, "Got non-mod")
-
-		retval = set()
-
-		for dep in package.dependencies.filter_by(optional=False).all():
-			ret = self.resolve_for_meta_package(dep.meta_package, history)
-			if len(ret) == 0:
-				continue
-			elif len(retval) == 0:
-				retval.update(ret)
-			else:
-				retval.intersection_update(ret)
-				if len(retval) == 0:
-					raise LogicError(500, f"Detected game support contradiction, {key} may not be compatible with any games")
-
-		self.resolved_packages[key] = retval
-		return retval
-
-	def init_all(self) -> None:
-		for package in self.session.query(Package).filter(Package.type == PackageType.MOD, Package.state != PackageState.DELETED).all():
-			retval = self.resolve(package, [])
-			for game_id in retval:
-				game = self.session.query(Package).get(game_id)
-				support = PackageGameSupport(package, game, 1, True)
-				self.session.add(support)
-
-	"""
-	Update game supported package on a package, given the confidence.
-	
-	Higher confidences outweigh lower ones.
-	"""
-	def set_supported(self, package: Package, game_is_supported: Dict[int, bool], confidence: int):
-		previous_supported: Dict[int, PackageGameSupport] = {}
-		for support in package.supported_games.all():
-			previous_supported[support.game.id] = support
-
-		for game_id, supports in game_is_supported.items():
-			game = self.session.query(Package).get(game_id)
-			lookup = previous_supported.pop(game_id, None)
-			if lookup is None:
-				support = PackageGameSupport(package, game, confidence, supports)
-				self.session.add(support)
-			elif lookup.confidence <= confidence:
-				lookup.supports = supports
-				lookup.confidence = confidence
-
-		for game, support in previous_supported.items():
-			if support.confidence == confidence:
-				self.session.delete(support)
-
-	def update(self, package: Package) -> None:
-		game_is_supported = {}
-		if package.enable_game_support_detection:
-			retval = self.resolve(package, [])
-			for game_id in retval:
-				game_is_supported[game_id] = True
-
-		self.set_supported(package, game_is_supported, 1)

app/logic/graphs.py

@@ -1,166 +0,0 @@
-# ContentDB
-# Copyright (C) rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import datetime
-from datetime import timedelta
-from typing import Optional
-
-from app.models import User, Package, PackageDailyStats, db, PackageState
-from sqlalchemy import func
-
-
-def daterange(start_date, end_date):
-	for n in range(int((end_date - start_date).days) + 1):
-		yield start_date + timedelta(n)
-
-
-keys = ["platform_minetest", "platform_other", "reason_new",
-		"reason_dependency", "reason_update"]
-
-
-def flatten_data(stats):
-	start_date = stats[0].date
-	end_date = stats[-1].date
-	result = {
-		"start": start_date.isoformat(),
-		"end": end_date.isoformat(),
-	}
-
-	for key in keys:
-		result[key] = []
-
-	i = 0
-	for date in daterange(start_date, end_date):
-		stat = stats[i]
-		if stat.date == date:
-			for key in keys:
-				result[key].append(getattr(stat, key))
-
-			i += 1
-		else:
-			for key in keys:
-				result[key].append(0)
-
-	return result
-
-
-def get_package_stats(package: Package, start_date: Optional[datetime.date], end_date: Optional[datetime.date]):
-	query = package.daily_stats.order_by(db.asc(PackageDailyStats.date))
-	if start_date:
-		query = query.filter(PackageDailyStats.date >= start_date)
-	if end_date:
-		query = query.filter(PackageDailyStats.date <= end_date)
-
-	stats = query.all()
-	if len(stats) == 0:
-		return None
-
-	return flatten_data(stats)
-
-
-def get_package_stats_for_user(user: User, start_date: Optional[datetime.date], end_date: Optional[datetime.date]):
-	query = db.session \
-		.query(PackageDailyStats.date,
-			func.sum(PackageDailyStats.platform_minetest).label("platform_minetest"),
-			func.sum(PackageDailyStats.platform_other).label("platform_other"),
-			func.sum(PackageDailyStats.reason_new).label("reason_new"),
-			func.sum(PackageDailyStats.reason_dependency).label("reason_dependency"),
-			func.sum(PackageDailyStats.reason_update).label("reason_update")) \
-		.filter(PackageDailyStats.package.has(author_id=user.id))
-
-	if start_date:
-		query = query.filter(PackageDailyStats.date >= start_date)
-	if end_date:
-		query = query.filter(PackageDailyStats.date <= end_date)
-
-	stats = query.order_by(db.asc(PackageDailyStats.date)) \
-		.group_by(PackageDailyStats.date) \
-		.all()
-	if len(stats) == 0:
-		return None
-
-	results = flatten_data(stats)
-	results["package_downloads"] = get_package_overview_for_user(user, stats[0].date, stats[-1].date)
-
-	return results
-
-
-def get_package_overview_for_user(user: Optional[User], start_date: datetime.date, end_date: datetime.date):
-	query = db.session \
-		.query(PackageDailyStats.package_id, PackageDailyStats.date,
-			(PackageDailyStats.platform_minetest + PackageDailyStats.platform_other).label("downloads"))
-
-	if user:
-		query = query.filter(PackageDailyStats.package.has(author_id=user.id))
-
-	all_stats = query \
-		.filter(PackageDailyStats.package.has(state=PackageState.APPROVED),
-				PackageDailyStats.date >= start_date, PackageDailyStats.date <= end_date) \
-		.order_by(db.asc(PackageDailyStats.package_id), db.asc(PackageDailyStats.date)) \
-		.all()
-
-	stats_by_package = {}
-	for stat in all_stats:
-		bucket = stats_by_package.get(stat.package_id, [])
-		stats_by_package[stat.package_id] = bucket
-
-		bucket.append(stat)
-
-	package_title_by_id = {}
-	pkg_query = user.packages if user else Package.query
-	for package in pkg_query.filter_by(state=PackageState.APPROVED).all():
-		if user:
-			package_title_by_id[package.id] = package.title
-		else:
-			package_title_by_id[package.id] = package.get_id()
-
-	result = {}
-
-	for package_id, stats in stats_by_package.items():
-		i = 0
-		row = []
-		result[package_title_by_id[package_id]] = row
-		for date in daterange(start_date, end_date):
-			if i >= len(stats):
-				row.append(0)
-				continue
-
-			stat = stats[i]
-			if stat.date == date:
-				row.append(stat.downloads)
-				i += 1
-			elif stat.date > date:
-				row.append(0)
-			else:
-				raise Exception(f"Invalid logic, expected stat {stat.date} to be later than {date}")
-
-	return result
-
-
-def get_all_package_stats(start_date: Optional[datetime.date] = None, end_date: Optional[datetime.date] = None):
-	now_date = datetime.datetime.utcnow().date()
-	if end_date is None or end_date > now_date:
-		end_date = now_date
-
-	min_start_date = (datetime.datetime.utcnow() - datetime.timedelta(days=29)).date()
-	if start_date is None or start_date < min_start_date:
-		start_date = min_start_date
-
-	return {
-		"start": start_date.isoformat(),
-		"end": end_date.isoformat(),
-		"package_downloads": get_package_overview_for_user(None, start_date, end_date),
-	}

app/logic/package_validator.py

@@ -1,56 +0,0 @@
-# ContentDB
-# Copyright (C) rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-from collections import namedtuple
-from typing import List
-
-from flask_babel import lazy_gettext
-from sqlalchemy import and_, or_
-
-from app.models import Package, PackageType, PackageState, PackageRelease
-
-
-ValidationError = namedtuple("ValidationError", "status message")
-
-
-def validate_package_for_approval(package: Package) -> List[ValidationError]:
-	retval: List[ValidationError] = []
-
-	normalised_name = package.getNormalisedName()
-	if package.type != PackageType.MOD and Package.query.filter(
-			and_(Package.state == PackageState.APPROVED,
-				or_(Package.name == normalised_name,
-					Package.name == normalised_name + "_game"))).count() > 0:
-		retval.append(("danger", lazy_gettext("A package already exists with this name. Please see Policy and Guidance 3")))
-
-	if package.releases.filter(PackageRelease.task_id == None).count() == 0:
-		retval.append(("danger", lazy_gettext("A release is required before this package can be approved.")))
-		# Don't bother validating any more until we have a release
-		return retval
-
-	missing_deps = package.get_missing_hard_dependencies_query().all()
-	if len(missing_deps) > 0:
-		retval.append(("danger", lazy_gettext(
-			"The following hard dependencies need to be added to ContentDB first: %(deps)s", deps=missing_deps)))
-
-	if (package.type == package.type.GAME or package.type == package.type.TXP) and \
-		package.screenshots.count() == 0:
-		retval.append(("danger", lazy_gettext("You need to add at least one screenshot.")))
-
-	if "Other" in package.license.name or "Other" in package.media_license.name:
-		retval.append(("info", lazy_gettext("Please wait for the license to be added to CDB.")))
-
-	return retval

app/logic/packages.py

@@ -14,21 +14,16 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import json
-import re
-import typing
 
+import re
 import validators
-from flask_babel import lazy_gettext, LazyString
 
 from app.logic.LogicError import LogicError
-from app.models import User, Package, PackageType, MetaPackage, Tag, ContentWarning, db, Permission, AuditSeverity, \
-	License, UserRank, PackageDevState
-from app.utils import add_audit_log, has_blocked_domains, diff_dictionaries, describe_difference
-from app.utils.url import clean_youtube_url
+from app.models import User, Package, PackageType, MetaPackage, Tag, ContentWarning, db, Permission, AuditSeverity, License
+from app.utils import addAuditLog
 
 
-def check(cond: bool, msg: typing.Union[str, LazyString]):
+def check(cond: bool, msg: str):
 	if not cond:
 		raise LogicError(400, msg)
 
@@ -39,24 +34,23 @@ def get_license(name):
 
 	license = License.query.filter(License.name.ilike(name)).first()
 	if license is None:
-		raise LogicError(400, "Unknown license " + name)
+		raise LogicError(400, "Unknown license: " + name)
 	return license
 
 
 name_re = re.compile("^[a-z0-9_]+$")
 
-AnyType = "?"
+any = "?"
 ALLOWED_FIELDS = {
-	"type": AnyType,
+	"type": any,
 	"title": str,
 	"name": str,
 	"short_description": str,
 	"short_desc": str,
-	"dev_state": AnyType,
 	"tags": list,
 	"content_warnings": list,
-	"license": AnyType,
-	"media_license": AnyType,
+	"license": any,
+	"media_license": any,
 	"long_description": str,
 	"desc": str,
 	"repo": str,
@@ -64,8 +58,6 @@ ALLOWED_FIELDS = {
 	"issue_tracker": str,
 	"issueTracker": str,
 	"forums": int,
-	"video_url": str,
-	"donate_url": str,
 }
 
 ALIASES = {
@@ -88,14 +80,14 @@ def validate(data: dict):
 		if value is not None:
 			typ = ALLOWED_FIELDS.get(key)
 			check(typ is not None, key + " is not a known field")
-			if typ != AnyType:
+			if typ != any:
 				check(isinstance(value, typ), key + " must be a " + typ.__name__)
 
 	if "name" in data:
 		name = data["name"]
 		check(isinstance(name, str), "Name must be a string")
 		check(bool(name_re.match(name)),
-			lazy_gettext("Name can only contain lower case letters (a-z), digits (0-9), and underscores (_)"))
+			"Name can only contain lower case letters (a-z), digits (0-9), and underscores (_)")
 
 	for key in ["repo", "website", "issue_tracker", "issueTracker"]:
 		value = data.get(key)
@@ -106,18 +98,13 @@ def validate(data: dict):
 			check(validators.url(value, public=True), key + " must be a valid URL")
 
 
-def do_edit_package(user: User, package: Package, was_new: bool, was_web: bool, data: dict,
-		reason: str = None):
-	if not package.check_perm(user, Permission.EDIT_PACKAGE):
-		raise LogicError(403, lazy_gettext("You don't have permission to edit this package"))
+def do_edit_package(user: User, package: Package, was_new: bool, data: dict, reason: str = None):
+	if not package.checkPerm(user, Permission.EDIT_PACKAGE):
+		raise LogicError(403, "You do not have permission to edit this package")
 
 	if "name" in data and package.name != data["name"] and \
-			not package.check_perm(user, Permission.CHANGE_NAME):
-		raise LogicError(403, lazy_gettext("You don't have permission to change the package name"))
-
-	before_dict = None
-	if not was_new:
-		before_dict = package.as_dict("/")
+			not package.checkPerm(user, Permission.CHANGE_NAME):
+		raise LogicError(403, "You do not have permission to change the package name")
 
 	for alias, to in ALIASES.items():
 		if alias in data:
@@ -125,30 +112,17 @@ def do_edit_package(user: User, package: Package, was_new: bool, was_web: bool,
 
 	validate(data)
 
-	for field in ["short_desc", "desc", "website", "issueTracker", "repo", "video_url", "donate_url"]:
-		if field in data and has_blocked_domains(data[field], user.username,
-					f"{field} of {package.get_id()}"):
-			raise LogicError(403, lazy_gettext("Linking to blocked sites is not allowed"))
-
 	if "type" in data:
 		data["type"] = PackageType.coerce(data["type"])
 
-	if "dev_state" in data:
-		data["dev_state"] = PackageDevState.coerce(data["dev_state"])
-
 	if "license" in data:
 		data["license"] = get_license(data["license"])
 
 	if "media_license" in data:
 		data["media_license"] = get_license(data["media_license"])
 
-	if "video_url" in data and data["video_url"] is not None:
-		data["video_url"] = clean_youtube_url(data["video_url"]) or data["video_url"]
-		if "dQw4w9WgXcQ" in data["video_url"]:
-			raise LogicError(403, "Never gonna give you up / Never gonna let you down / Never gonna run around and desert you")
-
-	for key in ["name", "title", "short_desc", "desc", "type", "dev_state", "license", "media_license",
-			"repo", "website", "issueTracker", "forums", "video_url", "donate_url"]:
+	for key in ["name", "title", "short_desc", "desc", "type", "license", "media_license",
+			"repo", "website", "issueTracker", "forums"]:
 		if key in data:
 			setattr(package, key, data[key])
 
@@ -160,21 +134,19 @@ def do_edit_package(user: User, package: Package, was_new: bool, was_web: bool,
 		package.provides.append(m)
 
 	if "tags" in data:
-		old_tags = list(package.tags)
 		package.tags.clear()
-		for tag_id in (data["tags"] or []):
+		for tag_id in data["tags"]:
 			if is_int(tag_id):
-				tag = Tag.query.get(tag_id)
+				package.tags.append(Tag.query.get(tag_id))
 			else:
 				tag = Tag.query.filter_by(name=tag_id).first()
 				if tag is None:
 					raise LogicError(400, "Unknown tag: " + tag_id)
-
-			package.tags.append(tag)
+				package.tags.append(tag)
 
 	if "content_warnings" in data:
 		package.content_warnings.clear()
-		for warning_id in (data["content_warnings"] or []):
+		for warning_id in data["content_warnings"]:
 			if is_int(warning_id):
 				package.content_warnings.append(ContentWarning.query.get(warning_id))
 			else:
@@ -184,20 +156,13 @@ def do_edit_package(user: User, package: Package, was_new: bool, was_web: bool,
 				package.content_warnings.append(warning)
 
 	if not was_new:
-		after_dict = package.as_dict("/")
-		diff = diff_dictionaries(before_dict, after_dict)
-
 		if reason is None:
 			msg = "Edited {}".format(package.title)
 		else:
 			msg = "Edited {} ({})".format(package.title, reason)
 
-		diff_desc = describe_difference(diff, 100 - len(msg) - 3) if diff else None
-		if diff_desc:
-			msg += " [" + diff_desc + "]"
-
 		severity = AuditSeverity.NORMAL if user in package.maintainers else AuditSeverity.EDITOR
-		add_audit_log(severity, user, msg, package.get_url("packages.view"), package, json.dumps(diff, indent=4))
+		addAuditLog(severity, user, msg, package.getDetailsURL(), package)
 
 	db.session.commit()
 

app/logic/releases.py

@@ -14,27 +14,26 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+
 import datetime
-import re
 
 from celery import uuid
-from flask_babel import lazy_gettext
 
 from app.logic.LogicError import LogicError
 from app.logic.uploads import upload_file
 from app.models import PackageRelease, db, Permission, User, Package, MinetestRelease
-from app.tasks.importtasks import make_vcs_release, check_zip_release
-from app.utils import AuditSeverity, add_audit_log, nonempty_or_none
+from app.tasks.importtasks import makeVCSRelease, checkZipRelease
+from app.utils import AuditSeverity, addAuditLog, nonEmptyOrNone
 
 
 def check_can_create_release(user: User, package: Package):
-	if not package.check_perm(user, Permission.MAKE_RELEASE):
-		raise LogicError(403, lazy_gettext("You don't have permission to make releases"))
+	if not package.checkPerm(user, Permission.MAKE_RELEASE):
+		raise LogicError(403, "You do not have permission to make releases")
 
 	five_minutes_ago = datetime.datetime.now() - datetime.timedelta(minutes=5)
 	count = package.releases.filter(PackageRelease.releaseDate > five_minutes_ago).count()
-	if count >= 5:
-		raise LogicError(429, lazy_gettext("You've created too many releases for this package in the last 5 minutes, please wait before trying again"))
+	if count >= 2:
+		raise LogicError(429, "Too many requests, please wait before trying again")
 
 
 def do_create_vcs_release(user: User, package: Package, title: str, ref: str,
@@ -54,25 +53,19 @@ def do_create_vcs_release(user: User, package: Package, title: str, ref: str,
 		msg = "Created release {}".format(rel.title)
 	else:
 		msg = "Created release {} ({})".format(rel.title, reason)
-	add_audit_log(AuditSeverity.NORMAL, user, msg, package.get_url("packages.view"), package)
+	addAuditLog(AuditSeverity.NORMAL, user, msg, package.getDetailsURL(), package)
 
 	db.session.commit()
 
-	make_vcs_release.apply_async((rel.id, nonempty_or_none(ref)), task_id=rel.task_id)
+	makeVCSRelease.apply_async((rel.id, nonEmptyOrNone(ref)), task_id=rel.task_id)
 
 	return rel
 
 
 def do_create_zip_release(user: User, package: Package, title: str, file,
-		min_v: MinetestRelease = None, max_v: MinetestRelease = None, reason: str = None,
-		commit_hash: str = None):
+		min_v: MinetestRelease = None, max_v: MinetestRelease = None, reason: str = None):
 	check_can_create_release(user, package)
 
-	if commit_hash:
-		commit_hash = commit_hash.lower()
-		if not (len(commit_hash) == 40 and re.match(r"^[0-9a-f]+$", commit_hash)):
-			raise LogicError(400, lazy_gettext("Invalid commit hash; it must be a 40 character long base16 string"))
-
 	uploaded_url, uploaded_path = upload_file(file, "zip", "a zip file")
 
 	rel = PackageRelease()
@@ -80,7 +73,6 @@ def do_create_zip_release(user: User, package: Package, title: str, file,
 	rel.title   = title
 	rel.url     = uploaded_url
 	rel.task_id = uuid()
-	rel.commit_hash = commit_hash
 	rel.min_rel = min_v
 	rel.max_rel = max_v
 	db.session.add(rel)
@@ -89,10 +81,10 @@ def do_create_zip_release(user: User, package: Package, title: str, file,
 		msg = "Created release {}".format(rel.title)
 	else:
 		msg = "Created release {} ({})".format(rel.title, reason)
-	add_audit_log(AuditSeverity.NORMAL, user, msg, package.get_url("packages.view"), package)
+	addAuditLog(AuditSeverity.NORMAL, user, msg, package.getDetailsURL(), package)
 
 	db.session.commit()
 
-	check_zip_release.apply_async((rel.id, uploaded_path), task_id=rel.task_id)
+	checkZipRelease.apply_async((rel.id, uploaded_path), task_id=rel.task_id)
 
 	return rel

app/logic/scope.py

@@ -1,6 +0,0 @@
-from app.models import APIToken
-
-
-class Scope:
-	def copy_to_token(self, token: APIToken):
-		pass

app/logic/screenshots.py

@@ -1,37 +1,18 @@
-# ContentDB
-# Copyright (C) rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import datetime, json
-
-from flask_babel import lazy_gettext
+import datetime
 
 from app.logic.LogicError import LogicError
 from app.logic.uploads import upload_file
 from app.models import User, Package, PackageScreenshot, Permission, NotificationType, db, AuditSeverity
-from app.utils import add_notification, add_audit_log
-from app.utils.image import get_image_size
+from app.utils import addNotification, addAuditLog
 
 
-def do_create_screenshot(user: User, package: Package, title: str, file, is_cover_image: bool, reason: str = None):
+def do_create_screenshot(user: User, package: Package, title: str, file, reason: str = None):
 	thirty_minutes_ago = datetime.datetime.now() - datetime.timedelta(minutes=30)
 	count = package.screenshots.filter(PackageScreenshot.created_at > thirty_minutes_ago).count()
 	if count >= 20:
-		raise LogicError(429, lazy_gettext("Too many requests, please wait before trying again"))
+		raise LogicError(429, "Too many requests, please wait before trying again")
 
-	uploaded_url, uploaded_path = upload_file(file, "image", lazy_gettext("a PNG or JPG image file"))
+	uploaded_url, uploaded_path = upload_file(file, "image", "a PNG or JPG image file")
 
 	counter = 1
 	for screenshot in package.screenshots.all():
@@ -42,15 +23,8 @@ def do_create_screenshot(user: User, package: Package, title: str, file, is_cove
 	ss.package  = package
 	ss.title    = title or "Untitled"
 	ss.url      = uploaded_url
-	ss.approved = package.check_perm(user, Permission.APPROVE_SCREENSHOT)
+	ss.approved = package.checkPerm(user, Permission.APPROVE_SCREENSHOT)
 	ss.order    = counter
-	ss.width, ss.height = get_image_size(uploaded_path)
-
-	if ss.is_too_small():
-		raise LogicError(429,
-				lazy_gettext("Screenshot is too small, it should be at least %(width)s by %(height)s pixels",
-						width=PackageScreenshot.HARD_MIN_SIZE[0], height=PackageScreenshot.HARD_MIN_SIZE[1]))
-
 	db.session.add(ss)
 
 	if reason is None:
@@ -58,15 +32,11 @@ def do_create_screenshot(user: User, package: Package, title: str, file, is_cove
 	else:
 		msg = "Created screenshot {} ({})".format(ss.title, reason)
 
-	add_notification(package.maintainers, user, NotificationType.PACKAGE_EDIT, msg, package.get_url("packages.view"), package)
-	add_audit_log(AuditSeverity.NORMAL, user, msg, package.get_url("packages.view"), package)
+	addNotification(package.maintainers, user, NotificationType.PACKAGE_EDIT, msg, package.getDetailsURL(), package)
+	addAuditLog(AuditSeverity.NORMAL, user, msg, package.getDetailsURL(), package)
 
 	db.session.commit()
 
-	if is_cover_image:
-		package.cover_image = ss
-		db.session.commit()
-
 	return ss
 
 
@@ -76,28 +46,13 @@ def do_order_screenshots(_user: User, package: Package, order: [any]):
 		lookup[screenshot.id] = screenshot
 
 	counter = 1
-	for ss_id in order:
+	for id in order:
 		try:
-			lookup[int(ss_id)].order = counter
+			lookup[int(id)].order = counter
 			counter += 1
-		except KeyError:
-			raise LogicError(400, "Unable to find screenshot with id={}".format(ss_id))
-		except (ValueError, TypeError):
-			raise LogicError(400, "Invalid id, not a number: {}".format(json.dumps(ss_id)))
+		except KeyError as e:
+			raise LogicError(400, "Unable to find screenshot with id={}".format(id))
+		except ValueError as e:
+			raise LogicError(400, "Invalid number: {}".format(id))
 
 	db.session.commit()
-
-
-def do_set_cover_image(_user: User, package: Package, cover_image):
-	try:
-		cover_image = int(cover_image)
-	except (ValueError, TypeError):
-		raise LogicError(400, "Invalid id, not a number: {}".format(json.dumps(cover_image)))
-
-	for screenshot in package.screenshots.all():
-		if screenshot.id == cover_image:
-			package.cover_image = screenshot
-			db.session.commit()
-			return
-
-	raise LogicError(400, "Unable to find screenshot")

app/logic/uploads.py

@@ -14,52 +14,47 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+
 import imghdr
 import os
 
-from flask_babel import lazy_gettext
-
-from app import app
 from app.logic.LogicError import LogicError
-from app.utils import random_string
+from app.models import *
+from app.utils import randomString
 
 
 def get_extension(filename):
 	return filename.rsplit(".", 1)[1].lower() if "." in filename else None
 
-
 ALLOWED_IMAGES = {"jpeg", "png"}
-
-
-def is_allowed_image(data):
+def isAllowedImage(data):
 	return imghdr.what(None, data) in ALLOWED_IMAGES
 
-
-def upload_file(file, file_type, file_type_desc):
+def upload_file(file, fileType, fileTypeDesc):
 	if not file or file is None or file.filename == "":
 		raise LogicError(400, "Expected file")
 
 	assert os.path.isdir(app.config["UPLOAD_DIR"]), "UPLOAD_DIR must exist"
 
-	is_image = False
-	if file_type == "image":
-		allowed_extensions = ["jpg", "jpeg", "png"]
-		is_image = True
-	elif file_type == "zip":
-		allowed_extensions = ["zip"]
+	isImage = False
+	if fileType == "image":
+		allowedExtensions = ["jpg", "jpeg", "png"]
+		isImage = True
+	elif fileType == "zip":
+		allowedExtensions = ["zip"]
 	else:
 		raise Exception("Invalid fileType")
 
 	ext = get_extension(file.filename)
-	if ext is None or ext not in allowed_extensions:
-		raise LogicError(400, lazy_gettext("Please upload %(file_desc)s", file_desc=file_type_desc))
+	if ext is None or not ext in allowedExtensions:
+		raise LogicError(400, "Please upload " + fileTypeDesc)
 
-	if is_image and not is_allowed_image(file.stream.read()):
-		raise LogicError(400, lazy_gettext("Uploaded image isn't actually an image"))
+	if isImage and not isAllowedImage(file.stream.read()):
+		raise LogicError(400, "Uploaded image isn't actually an image")
 
 	file.stream.seek(0)
 
-	filename = random_string(10) + "." + ext
+	filename = randomString(10) + "." + ext
 	filepath = os.path.join(app.config["UPLOAD_DIR"], filename)
 	file.save(filepath)
 

app/maillogger.py

@@ -1,19 +1,3 @@
-# ContentDB
-# Copyright (C) rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 import logging
 
 from app.tasks.emails import send_user_email
@@ -25,7 +9,6 @@ def _has_newline(line):
 		return True
 	return False
 
-
 def _is_bad_subject(subject):
 	"""Copied from: flask_mail.py class Message def has_bad_headers"""
 	if _has_newline(subject):
@@ -49,11 +32,9 @@ class FlaskMailSubjectFormatter(logging.Formatter):
 		s = self.formatMessage(record)
 		return s
 
-
 class FlaskMailTextFormatter(logging.Formatter):
 	pass
 
-
 class FlaskMailHTMLFormatter(logging.Formatter):
 	def formatException(self, exc_info):
 		formatted_exception = logging.Handler.formatException(self, exc_info)
@@ -83,21 +64,16 @@ class FlaskMailHandler(logging.Handler):
 	def getSubject(self, record):
 		fmt = FlaskMailSubjectFormatter(self.subject_template)
 		subject = fmt.format(record)
-		# Since templates can cause header problems, and we rather have an incomplete email then an error, we fix this
+		# Since templates can cause header problems, and we rather have a incomplete email then an error, we fix this
 		if _is_bad_subject(subject):
 			subject="FlaskMailHandler log-entry from ContentDB [original subject is replaced, because it would result in a bad header]"
 		return subject
 
 	def emit(self, record):
-		subject = self.getSubject(record)
 		text = self.format(record)				if self.formatter	  else None
 		html = "<pre>{}</pre>".format(text)
-
-		if "The recipient has exceeded message rate limit. Try again later" in subject:
-			return
-
 		for email in self.send_to:
-			send_user_email.delay(email, "en", subject, text, html)
+			send_user_email.delay(email, self.getSubject(record), text, html)
 
 
 def build_handler(app):

app/markdown.py

@@ -1,204 +0,0 @@
-# ContentDB
-# Copyright (C) rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-from functools import partial
-
-import bleach
-from bleach import Cleaner
-from bleach.linkifier import LinkifyFilter
-from bs4 import BeautifulSoup
-from markdown import Markdown
-from flask import url_for
-from jinja2.utils import markupsafe
-from markdown.extensions import Extension
-from markdown.inlinepatterns import SimpleTagInlineProcessor
-from markdown.inlinepatterns import Pattern
-from markdown.extensions.codehilite import CodeHiliteExtension
-from xml.etree import ElementTree
-
-# Based on
-# https://github.com/Wenzil/mdx_bleach/blob/master/mdx_bleach/whitelist.py
-#
-# License: MIT
-
-ALLOWED_TAGS = {
-	"h1", "h2", "h3", "h4", "h5", "h6", "hr",
-	"ul", "ol", "li",
-	"p",
-	"br",
-	"pre",
-	"code",
-	"blockquote",
-	"strong",
-	"em",
-	"a",
-	"img",
-	"table", "thead", "tbody", "tr", "th", "td",
-	"div", "span", "del", "s",
-}
-
-ALLOWED_CSS = [
-	"highlight", "codehilite",
-	"hll", "c", "err", "g", "k", "l", "n", "o", "x", "p", "ch", "cm", "cp", "cpf", "c1", "cs",
-	"gd", "ge", "gr", "gh", "gi", "go", "gp", "gs", "gu", "gt", "kc", "kd", "kn", "kp", "kr",
-	"kt", "ld", "m", "s", "na", "nb", "nc", "no", "nd", "ni", "ne", "nf", "nl", "nn", "nx",
-	"py", "nt", "nv", "ow", "w", "mb", "mf", "mh", "mi", "mo", "sa", "sb", "sc", "dl", "sd",
-	"s2", "se", "sh", "si", "sx", "sr", "s1", "ss", "bp", "fm", "vc", "vg", "vi", "vm", "il",
-]
-
-
-def allow_class(_tag, name, value):
-	return name == "class" and value in ALLOWED_CSS
-
-
-ALLOWED_ATTRIBUTES = {
-	"h1": ["id"],
-	"h2": ["id"],
-	"h3": ["id"],
-	"h4": ["id"],
-	"a": ["href", "title", "data-username"],
-	"img": ["src", "title", "alt"],
-	"code": allow_class,
-	"div": allow_class,
-	"span": allow_class,
-}
-
-ALLOWED_PROTOCOLS = {"http", "https", "mailto"}
-
-md = None
-
-
-def linker_callback(attrs, new=False):
-	if new:
-		text = attrs.get("_text")
-		if not (text.startswith("http://") or text.startswith("https://")):
-			return None
-	return attrs
-
-
-def render_markdown(source):
-	html = md.convert(source)
-
-	cleaner = Cleaner(
-		tags=ALLOWED_TAGS,
-		attributes=ALLOWED_ATTRIBUTES,
-		protocols=ALLOWED_PROTOCOLS,
-		filters=[partial(LinkifyFilter,
-				callbacks=[linker_callback] + bleach.linkifier.DEFAULT_CALLBACKS,
-				skip_tags={"pre", "code"})])
-	return cleaner.clean(html)
-
-
-class DelInsExtension(Extension):
-	def extendMarkdown(self, md):
-		del_proc = SimpleTagInlineProcessor(r"(\~\~)(.+?)(\~\~)", "del")
-		md.inlinePatterns.register(del_proc, "del", 200)
-
-		ins_proc = SimpleTagInlineProcessor(r"(\+\+)(.+?)(\+\+)", "ins")
-		md.inlinePatterns.register(ins_proc, "ins", 200)
-
-
-RE_PARTS = dict(
-	USER=r"[A-Za-z0-9._-]*\b",
-	REPO=r"[A-Za-z0-9_]+\b"
-)
-
-
-class MentionPattern(Pattern):
-	ANCESTOR_EXCLUDES = ("a",)
-
-	def __init__(self, config, md):
-		MENTION_RE = r"(@({USER})(?:\/({REPO}))?)".format(**RE_PARTS)
-		super(MentionPattern, self).__init__(MENTION_RE, md)
-		self.config = config
-
-	def handleMatch(self, m):
-		from app.models import User
-
-		label = m.group(2)
-		user = m.group(3)
-		package_name = m.group(4)
-		if package_name:
-			el = ElementTree.Element("a")
-			el.text = label
-			el.set("href", url_for("packages.view", author=user, name=package_name))
-			return el
-		else:
-			if User.query.filter_by(username=user).count() == 0:
-				return None
-
-			el = ElementTree.Element("a")
-			el.text = label
-			el.set("href", url_for("users.profile", username=user))
-			el.set("data-username", user)
-			return el
-
-
-class MentionExtension(Extension):
-	def __init__(self, *args, **kwargs):
-		super(MentionExtension, self).__init__(*args, **kwargs)
-
-	def extendMarkdown(self, md):
-		md.ESCAPED_CHARS.append("@")
-		md.inlinePatterns.register(MentionPattern(self.getConfigs(), md), "mention", 20)
-
-
-MARKDOWN_EXTENSIONS = ["fenced_code", "tables", CodeHiliteExtension(guess_lang=False), "toc", DelInsExtension(), MentionExtension()]
-MARKDOWN_EXTENSION_CONFIG = {
-	"fenced_code": {},
-	"tables": {}
-}
-
-
-def init_markdown(app):
-	global md
-
-	md = Markdown(extensions=MARKDOWN_EXTENSIONS,
-			extension_configs=MARKDOWN_EXTENSION_CONFIG,
-			output_format="html")
-
-	@app.template_filter()
-	def markdown(source):
-		return markupsafe.Markup(render_markdown(source))
-
-
-def get_headings(html: str):
-	soup = BeautifulSoup(html, "html.parser")
-	headings = soup.find_all(["h1", "h2", "h3"])
-
-	root = []
-	stack = []
-	for heading in headings:
-		this = {"link": heading.get("id") or "", "text": heading.text, "children": []}
-		this_level = int(heading.name[1:]) - 1
-
-		while this_level <= len(stack):
-			stack.pop()
-
-		if len(stack) > 0:
-			stack[-1]["children"].append(this)
-		else:
-			root.append(this)
-
-		stack.append(this)
-
-	return root
-
-
-def get_user_mentions(html: str) -> set:
-	soup = BeautifulSoup(html, "html.parser")
-	links = soup.select("a[data-username]")
-	return set([x.get("data-username") for x in links])

app/models/__init__.py

@@ -31,7 +31,6 @@ make_searchable(db.metadata)
 from .packages import *
 from .users import *
 from .threads import *
-from .collections import *
 
 
 class APIToken(db.Model):
@@ -48,44 +47,7 @@ class APIToken(db.Model):
 	package_id = db.Column(db.Integer, db.ForeignKey("package.id"), nullable=True)
 	package    = db.relationship("Package", foreign_keys=[package_id], back_populates="tokens")
 
-	client_id = db.Column(db.String(24), db.ForeignKey("oauth_client.id"), nullable=True)
-	client    = db.relationship("OAuthClient", foreign_keys=[client_id], back_populates="tokens")
-	auth_code = db.Column(db.String(34), unique=True, nullable=True)
-
-	scope_user_email = db.Column(db.Boolean, nullable=False, default=False)
-	scope_package = db.Column(db.Boolean, nullable=False, default=False)
-	scope_package_release = db.Column(db.Boolean, nullable=False, default=False)
-	scope_package_screenshot = db.Column(db.Boolean, nullable=False, default=False)
-
-	def get_scopes(self) -> set[str]:
-		ret = set()
-		if self.scope_user_email:
-			ret.add("user:email")
-		if self.scope_package:
-			ret.add("package")
-		if self.scope_package_release:
-			ret.add("package:release")
-		if self.scope_package_screenshot:
-			ret.add("package:screenshot")
-		return ret
-
-	def set_scopes(self, v: set[str]):
-		def pop(key: str):
-			if key in v:
-				v.remove(key)
-				return True
-
-		self.scope_user_email = pop("user:email")
-		self.scope_package = pop("package")
-		self.scope_package_release = pop("package:release") or self.scope_package
-		self.scope_package_screenshot = pop("package:screenshot") or self.scope_package
-		return v
-
-	def can_operate_on_package(self, package):
-		if (self.client is not None and
-				not (self.scope_package or self.scope_package_release or self.scope_package_screenshot)):
-			return False
-
+	def canOperateOnPackage(self, package):
 		if self.package and self.package != package:
 			return False
 
@@ -101,16 +63,16 @@ class AuditSeverity(enum.Enum):
 	def __str__(self):
 		return self.name
 
-	def get_title(self):
+	def getTitle(self):
 		return self.name.replace("_", " ").title()
 
 	@classmethod
 	def choices(cls):
-		return [(choice, choice.get_title()) for choice in cls]
+		return [(choice, choice.getTitle()) for choice in cls]
 
 	@classmethod
 	def coerce(cls, item):
-		return item if type(item) == AuditSeverity else AuditSeverity[item.upper()]
+		return item if type(item) == AuditSeverity else AuditSeverity[item]
 
 
 class AuditLogEntry(db.Model):
@@ -133,8 +95,6 @@ class AuditLogEntry(db.Model):
 
 	def __init__(self, causer, severity, title, url, package=None, description=None):
 		if len(title) > 100:
-			if description is None:
-				description = title[99:]
 			title = title[:99] + "…"
 
 		self.causer   = causer
@@ -144,20 +104,6 @@ class AuditLogEntry(db.Model):
 		self.package  = package
 		self.description = description
 
-	def check_perm(self, user, perm):
-		if not user.is_authenticated:
-			return False
-
-		if type(perm) == str:
-			perm = Permission[perm]
-		elif type(perm) != Permission:
-			raise Exception("Unknown permission given to AuditLogEntry.check_perm()")
-
-		if perm == Permission.VIEW_AUDIT_DESCRIPTION:
-			return user.rank.at_least(UserRank.APPROVER if self.package is not None else UserRank.MODERATOR)
-		else:
-			raise Exception("Permission {} is not related to audit log entries".format(perm.name))
-
 
 REPO_BLACKLIST = [".zip", "mediafire.com", "dropbox.com", "weebly.com",
 	"minetest.net", "dropboxusercontent.com", "4shared.com",
@@ -169,10 +115,10 @@ class ForumTopic(db.Model):
 	topic_id  = db.Column(db.Integer, primary_key=True, autoincrement=False)
 
 	author_id = db.Column(db.Integer, db.ForeignKey("user.id"), nullable=False)
-	author    = db.relationship("User", back_populates="forum_topics")
+	author    = db.relationship("User")
 
-	wip       = db.Column(db.Boolean, default=False, nullable=False)
-	discarded = db.Column(db.Boolean, default=False, nullable=False)
+	wip       = db.Column(db.Boolean, server_default="0")
+	discarded = db.Column(db.Boolean, server_default="0")
 
 	type      = db.Column(db.Enum(PackageType), nullable=False)
 	title     = db.Column(db.String(200), nullable=False)
@@ -184,7 +130,7 @@ class ForumTopic(db.Model):
 
 	created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
 
-	def get_repo_url(self):
+	def getRepoURL(self):
 		if self.link is None:
 			return None
 
@@ -194,11 +140,11 @@ class ForumTopic(db.Model):
 
 		return self.link.replace("repo.or.cz/w/", "repo.or.cz/")
 
-	def as_dict(self):
+	def getAsDictionary(self):
 		return {
 			"author": self.author.username,
 			"name":   self.name,
-			"type":   self.type.to_name(),
+			"type":   self.type.toName(),
 			"title":  self.title,
 			"id":     self.topic_id,
 			"link":   self.link,
@@ -209,17 +155,17 @@ class ForumTopic(db.Model):
 			"created_at": self.created_at.isoformat(),
 		}
 
-	def check_perm(self, user, perm):
+	def checkPerm(self, user, perm):
 		if not user.is_authenticated:
 			return False
 
 		if type(perm) == str:
 			perm = Permission[perm]
 		elif type(perm) != Permission:
-			raise Exception("Unknown permission given to ForumTopic.check_perm()")
+			raise Exception("Unknown permission given to ForumTopic.checkPerm()")
 
 		if perm == Permission.TOPIC_DISCARD:
-			return self.author == user or user.rank.at_least(UserRank.EDITOR)
+			return self.author == user or user.rank.atLeast(UserRank.EDITOR)
 
 		else:
 			raise Exception("Permission {} is not related to topics".format(perm.name))

app/models/collections.py

@@ -1,106 +0,0 @@
-# ContentDB
-# Copyright (C) 2023  rubenwardy
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import datetime
-
-from flask import url_for, current_app
-
-from . import db, Permission, User, UserRank
-
-
-class CollectionPackage(db.Model):
-	package_id = db.Column(db.Integer, db.ForeignKey("package.id"), primary_key=True)
-	package = db.relationship("Package", foreign_keys=[package_id])
-
-	collection_id = db.Column(db.Integer, db.ForeignKey("collection.id"), primary_key=True)
-	collection = db.relationship("Collection", back_populates="items", foreign_keys=[collection_id])
-
-	order = db.Column(db.Integer, nullable=False, default=0)
-	description = db.Column(db.String, nullable=True)
-	created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
-
-	collection_description_nonempty = db.CheckConstraint("description = NULL OR description != ''")
-
-	def as_dict(self):
-		return {
-			"package": self.package.as_short_dict(current_app.config["BASE_URL"]),
-			"order": self.order,
-			"description": self.description,
-			"created_at": self.created_at.isoformat(),
-		}
-
-
-class Collection(db.Model):
-	id = db.Column(db.Integer, primary_key=True)
-
-	author_id = db.Column(db.Integer, db.ForeignKey("user.id"), nullable=False)
-	author = db.relationship("User", back_populates="collections", foreign_keys=[author_id])
-
-	name = db.Column(db.Unicode(100), nullable=False)
-	title = db.Column(db.Unicode(100), nullable=False)
-	short_description = db.Column(db.Unicode(200), nullable=False)
-	long_description = db.Column(db.UnicodeText, nullable=True)
-	created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
-	private = db.Column(db.Boolean, nullable=False, default=False)
-
-	packages = db.relationship("Package", secondary=CollectionPackage.__table__, backref="collections")
-	items = db.relationship("CollectionPackage", back_populates="collection", order_by=db.asc("order"),
-		cascade="all, delete, delete-orphan")
-
-	collection_name_valid = db.CheckConstraint("name ~* '^[a-z0-9_]+$' AND name != '_game'")
-	__table_args__ = (db.UniqueConstraint("author_id", "name", name="_collection_uc"),)
-
-	def get_url(self, endpoint, **kwargs):
-		return url_for(endpoint, author=self.author.username, name=self.name, **kwargs)
-
-	def as_short_dict(self):
-		return {
-			"author": self.author.username,
-			"name": self.name,
-			"title": self.title,
-			"short_description": self.short_description,
-			"created_at": self.created_at.isoformat(),
-			"private": self.private,
-			"package_count": len(self.packages)
-		}
-
-	def as_dict(self):
-		return {
-			"author": self.author.username,
-			"name": self.name,
-			"title": self.title,
-			"short_description": self.short_description,
-			"long_description": self.long_description,
-			"created_at": self.created_at.isoformat(),
-			"private": self.private,
-		}
-
-	def check_perm(self, user: User, perm):
-		if type(perm) == str:
-			perm = Permission[perm]
-		elif type(perm) != Permission:
-			raise Exception("Unknown permission given to Collection.check_perm()")
-
-		if not user.is_authenticated:
-			return perm == Permission.VIEW_COLLECTION and not self.private
-
-		can_view = not self.private or self.author == user or user.rank.at_least(UserRank.MODERATOR)
-		if perm == Permission.VIEW_COLLECTION:
-			return can_view
-		elif perm == Permission.EDIT_COLLECTION:
-			return can_view and (self.author == user or user.rank.at_least(UserRank.EDITOR))
-		else:
-			raise Exception("Permission {} is not related to collections".format(perm.name))

app/models/threads.py

@@ -15,14 +15,14 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import datetime
-from typing import Tuple, List
 
 from flask import url_for
 
 from . import db
-from .users import Permission, UserRank, User
+from .users import Permission, UserRank
 from .packages import Package
 
+
 watchers = db.Table("watchers",
 	db.Column("user_id", db.Integer, db.ForeignKey("user.id"), primary_key=True),
 	db.Column("thread_id", db.Integer, db.ForeignKey("thread.id"), primary_key=True)
@@ -55,76 +55,42 @@ class Thread(db.Model):
 
 	watchers   = db.relationship("User", secondary=watchers, backref="watching")
 
-	first_reply = db.relationship("ThreadReply", uselist=False, foreign_keys="ThreadReply.thread_id",
-			lazy=True, order_by=db.asc("id"), viewonly=True,
-			primaryjoin="Thread.id==ThreadReply.thread_id")
+	def getViewURL(self):
+		return url_for("threads.view", id=self.id, _external=False)
 
-	def get_description(self):
-		comment = self.first_reply.comment.replace("\r\n", " ").replace("\n", " ").replace("  ", " ")
-		if len(comment) > 100:
-			return comment[:97] + "..."
-		else:
-			return comment
-
-	def get_view_url(self, absolute=False):
-		if absolute:
-			from app.utils import abs_url_for
-			return abs_url_for("threads.view", id=self.id)
-		else:
-			return url_for("threads.view", id=self.id, _external=False)
-
-	def get_subscribe_url(self):
+	def getSubscribeURL(self):
 		return url_for("threads.subscribe", id=self.id)
 
-	def get_unsubscribe_url(self):
+	def getUnsubscribeURL(self):
 		return url_for("threads.unsubscribe", id=self.id)
 
-	def check_perm(self, user, perm):
+	def checkPerm(self, user, perm):
+		if not user.is_authenticated:
+			return perm == Permission.SEE_THREAD and not self.private
+
 		if type(perm) == str:
 			perm = Permission[perm]
 		elif type(perm) != Permission:
-			raise Exception("Unknown permission given to Thread.check_perm()")
-
-		if not user.is_authenticated:
-			return perm == Permission.SEE_THREAD and not self.private
+			raise Exception("Unknown permission given to Thread.checkPerm()")
 
 		isMaintainer = user == self.author or (self.package is not None and self.package.author == user)
 		if self.package:
 			isMaintainer = isMaintainer or user in self.package.maintainers
 
-		canSee = not self.private or isMaintainer or user.rank.at_least(UserRank.APPROVER) or user in self.watchers
+		canSee = not self.private or isMaintainer or user.rank.atLeast(UserRank.EDITOR)
 
 		if perm == Permission.SEE_THREAD:
 			return canSee
 
 		elif perm == Permission.COMMENT_THREAD:
-			return canSee and (not self.locked or user.rank.at_least(UserRank.MODERATOR))
+			return canSee and (not self.locked or user.rank.atLeast(UserRank.MODERATOR))
 
-		elif perm == Permission.LOCK_THREAD:
-			return user.rank.at_least(UserRank.MODERATOR)
-
-		elif perm == Permission.DELETE_THREAD:
-			from app.utils.models import get_system_user
-			return (self.author == get_system_user() and self.package and
-					user in self.package.maintainers) or user.rank.at_least(UserRank.MODERATOR)
+		elif perm == Permission.LOCK_THREAD or perm == Permission.DELETE_THREAD:
+			return user.rank.atLeast(UserRank.MODERATOR)
 
 		else:
 			raise Exception("Permission {} is not related to threads".format(perm.name))
 
-	def get_visible_to(self) -> list[User]:
-		retval = {
-			self.author.username: self.author
-		}
-
-		for user in self.watchers:
-			retval[user.username] = user
-
-		if self.package:
-			for user in self.package.maintainers:
-				retval[user.username] = user
-
-		return list(retval.values())
-
 	def get_latest_reply(self):
 		return ThreadReply.query.filter_by(thread_id=self.id).order_by(db.desc(ThreadReply.id)).first()
 
@@ -140,27 +106,22 @@ class ThreadReply(db.Model):
 	author_id  = db.Column(db.Integer, db.ForeignKey("user.id"), nullable=False)
 	author     = db.relationship("User", back_populates="replies", foreign_keys=[author_id])
 
-	is_status_update = db.Column(db.Boolean, server_default="0", nullable=False)
-
 	created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
 
-	def get_url(self, absolute=False):
-		return self.thread.get_view_url(absolute) + "#reply-" + str(self.id)
-
-	def check_perm(self, user, perm):
+	def checkPerm(self, user, perm):
 		if not user.is_authenticated:
 			return False
 
 		if type(perm) == str:
 			perm = Permission[perm]
 		elif type(perm) != Permission:
-			raise Exception("Unknown permission given to ThreadReply.check_perm()")
+			raise Exception("Unknown permission given to ThreadReply.checkPerm()")
 
 		if perm == Permission.EDIT_REPLY:
-			return user.rank.at_least(UserRank.NEW_MEMBER if user == self.author else UserRank.MODERATOR) and not self.thread.locked
+			return user == self.author and user.rank.atLeast(UserRank.MEMBER) and not self.thread.locked
 
 		elif perm == Permission.DELETE_REPLY:
-			return user.rank.at_least(UserRank.MODERATOR) and self.thread.first_reply != self
+			return user.rank.atLeast(UserRank.MODERATOR) and self.thread.replies[0] != self
 
 		else:
 			raise Exception("Permission {} is not related to threads".format(perm.name))
@@ -177,94 +138,17 @@ class PackageReview(db.Model):
 	author_id  = db.Column(db.Integer, db.ForeignKey("user.id"), nullable=False)
 	author     = db.relationship("User", foreign_keys=[author_id], back_populates="reviews")
 
-	rating     = db.Column(db.Integer, nullable=False)
+	recommends = db.Column(db.Boolean, nullable=False)
 
 	thread     = db.relationship("Thread", uselist=False, back_populates="review")
-	votes      = db.relationship("PackageReviewVote", back_populates="review", cascade="all, delete, delete-orphan")
 
-	score      = db.Column(db.Integer, nullable=False, default=1)
+	def asSign(self):
+		return 1 if self.recommends else -1
 
-	def get_totals(self, current_user = None) -> Tuple[int,int,bool]:
-		votes: List[PackageReviewVote] = self.votes
-		pos = sum([ 1 for vote in votes if vote.is_positive ])
-		neg = sum([ 1 for vote in votes if not vote.is_positive])
-		user_vote = next(filter(lambda vote: vote.user == current_user, votes), None)
-		return pos, neg, user_vote.is_positive if user_vote else None
+	def getEditURL(self):
+		return self.package.getReviewURL()
 
-	def as_dict(self, include_package=False):
-		from app.utils import abs_url_for
-
-		pos, neg, _user = self.get_totals()
-		ret = {
-			"is_positive": self.rating > 3,
-			"rating": self.rating,
-			"user": {
-				"username": self.author.username,
-				"display_name": self.author.display_name,
-			},
-			"created_at": self.created_at.isoformat(),
-			"votes": {
-				"helpful": pos,
-				"unhelpful": neg,
-			},
-			"title": self.thread.title,
-			"comment": self.thread.first_reply.comment,
-			"thread": {
-				"id": self.thread.id,
-				"url": abs_url_for("threads.view", id=self.thread.id),
-			},
-		}
-		if include_package:
-			ret["package"] = self.package.as_key_dict()
-		return ret
-
-	def as_weight(self):
-		"""
-		From (1, 5) to (-1 to 1)
-		"""
-		return (self.rating - 3.0) / 2.0
-
-	def get_edit_url(self):
-		return self.package.get_url("packages.review")
-
-	def get_delete_url(self):
+	def getDeleteURL(self):
 		return url_for("packages.delete_review",
 				author=self.package.author.username,
-				name=self.package.name,
-				reviewer=self.author.username)
-
-	def get_vote_url(self, next_url=None):
-		return url_for("packages.review_vote",
-				author=self.package.author.username,
-				name=self.package.name,
-				review_id=self.id,
-				r=next_url)
-
-	def update_score(self):
-		(pos, neg, _) = self.get_totals()
-		self.score = 3 * (pos - neg) + 1
-
-	def check_perm(self, user, perm):
-		if not user.is_authenticated:
-			return False
-
-		if type(perm) == str:
-			perm = Permission[perm]
-		elif type(perm) != Permission:
-			raise Exception("Unknown permission given to PackageReview.check_perm()")
-
-		if perm == Permission.DELETE_REVIEW:
-			return user == self.author or user.rank.at_least(UserRank.MODERATOR)
-		else:
-			raise Exception("Permission {} is not related to reviews".format(perm.name))
-
-
-class PackageReviewVote(db.Model):
-	review_id = db.Column(db.Integer, db.ForeignKey("package_review.id"), primary_key=True)
-	review = db.relationship("PackageReview", foreign_keys=[review_id], back_populates="votes")
-	user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
-	user = db.relationship("User", foreign_keys=[user_id], back_populates="review_votes")
-
-	is_positive = db.Column(db.Boolean, nullable=False)
-
-	created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
+				name=self.package.name)

app/models/users.py

@@ -14,10 +14,10 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+
 import datetime
 import enum
 
-from flask import url_for
 from flask_login import UserMixin
 from sqlalchemy import desc, text
 
@@ -31,19 +31,18 @@ class UserRank(enum.Enum):
 	NEW_MEMBER     = 2
 	MEMBER         = 3
 	TRUSTED_MEMBER = 4
-	APPROVER       = 5
-	EDITOR         = 6
-	BOT            = 7
-	MODERATOR      = 8
-	ADMIN          = 9
+	EDITOR         = 5
+	BOT            = 6
+	MODERATOR      = 7
+	ADMIN          = 8
 
-	def at_least(self, min):
+	def atLeast(self, min):
 		return self.value >= min.value
 
-	def get_title(self):
+	def getTitle(self):
 		return self.name.replace("_", " ").title()
 
-	def to_name(self):
+	def toName(self):
 		return self.name.lower()
 
 	def __str__(self):
@@ -51,22 +50,23 @@ class UserRank(enum.Enum):
 
 	@classmethod
 	def choices(cls):
-		return [(choice, choice.get_title()) for choice in cls]
+		return [(choice, choice.getTitle()) for choice in cls]
 
 	@classmethod
 	def coerce(cls, item):
-		return item if type(item) == UserRank else UserRank[item.upper()]
+		return item if type(item) == UserRank else UserRank[item]
 
 
 class Permission(enum.Enum):
-	VIEW_PACKAGE       = "VIEW_PACKAGE"
 	EDIT_PACKAGE       = "EDIT_PACKAGE"
+	APPROVE_CHANGES    = "APPROVE_CHANGES"
 	DELETE_PACKAGE     = "DELETE_PACKAGE"
 	CHANGE_AUTHOR      = "CHANGE_AUTHOR"
 	CHANGE_NAME        = "CHANGE_NAME"
 	MAKE_RELEASE       = "MAKE_RELEASE"
 	DELETE_RELEASE     = "DELETE_RELEASE"
 	ADD_SCREENSHOTS    = "ADD_SCREENSHOTS"
+	REIMPORT_META      = "REIMPORT_META"
 	APPROVE_SCREENSHOT = "APPROVE_SCREENSHOT"
 	APPROVE_RELEASE    = "APPROVE_RELEASE"
 	APPROVE_NEW        = "APPROVE_NEW"
@@ -87,34 +87,27 @@ class Permission(enum.Enum):
 	TOPIC_DISCARD      = "TOPIC_DISCARD"
 	CREATE_TOKEN       = "CREATE_TOKEN"
 	EDIT_MAINTAINERS   = "EDIT_MAINTAINERS"
-	DELETE_REVIEW      = "DELETE_REVIEW"
 	CHANGE_PROFILE_URLS = "CHANGE_PROFILE_URLS"
-	CHANGE_DISPLAY_NAME = "CHANGE_DISPLAY_NAME"
-	VIEW_AUDIT_DESCRIPTION = "VIEW_AUDIT_DESCRIPTION"
-	EDIT_COLLECTION = "EDIT_COLLECTION"
-	VIEW_COLLECTION = "VIEW_COLLECTION"
-	CREATE_OAUTH_CLIENT = "CREATE_OAUTH_CLIENT"
 
 	# Only return true if the permission is valid for *all* contexts
-	# See Package.check_perm for package-specific contexts
+	# See Package.checkPerm for package-specific contexts
 	def check(self, user):
 		if not user.is_authenticated:
 			return False
 
 		if self == Permission.APPROVE_NEW or \
+				self == Permission.APPROVE_CHANGES    or \
 				self == Permission.APPROVE_RELEASE    or \
 				self == Permission.APPROVE_SCREENSHOT or \
+				self == Permission.EDIT_TAGS or \
+				self == Permission.CREATE_TAG or \
 				self == Permission.SEE_THREAD:
-			return user.rank.at_least(UserRank.APPROVER)
-
-		elif self == Permission.EDIT_TAGS or self == Permission.CREATE_TAG:
-			return user.rank.at_least(UserRank.EDITOR)
-
+			return user.rank.atLeast(UserRank.EDITOR)
 		else:
-			raise Exception("Non-global permission checked globally. Use Package.check_perm or User.check_perm instead.")
+			raise Exception("Non-global permission checked globally. Use Package.checkPerm or User.checkPerm instead.")
 
 	@staticmethod
-	def check_perm(user, perm):
+	def checkPerm(user, perm):
 		if type(perm) == str:
 			perm = Permission[perm]
 		elif type(perm) != Permission:
@@ -130,8 +123,6 @@ def display_name_default(context):
 class User(db.Model, UserMixin):
 	id           = db.Column(db.Integer, primary_key=True)
 
-	created_at = db.Column(db.DateTime, nullable=True, default=datetime.datetime.utcnow)
-
 	# User authentication information
 	username     = db.Column(db.String(50, collation="NOCASE"), nullable=False, unique=True, index=True)
 	password     = db.Column(db.String(255), nullable=True, server_default=None)
@@ -151,9 +142,7 @@ class User(db.Model, UserMixin):
 
 	# User email information
 	email         = db.Column(db.String(255), nullable=True, unique=True)
-	email_confirmed_at  = db.Column(db.DateTime(), nullable=True, server_default=None)
-
-	locale = db.Column(db.String(10), nullable=True, default=None)
+	email_confirmed_at  = db.Column(db.DateTime(), nullable=True)
 
 	# User information
 	profile_pic   = db.Column(db.String(255), nullable=True, server_default=None)
@@ -166,153 +155,108 @@ class User(db.Model, UserMixin):
 
 	# Content
 	notifications = db.relationship("Notification", foreign_keys="Notification.user_id",
-									order_by=desc(text("Notification.created_at")), back_populates="user", cascade="all, delete, delete-orphan")
+			order_by=desc(text("Notification.created_at")), back_populates="user", cascade="all, delete, delete-orphan")
 	caused_notifications = db.relationship("Notification", foreign_keys="Notification.causer_id",
-										   back_populates="causer", cascade="all, delete, delete-orphan", lazy="dynamic")
+			back_populates="causer", cascade="all, delete, delete-orphan", lazy="dynamic")
 	notification_preferences = db.relationship("UserNotificationPreferences", uselist=False, back_populates="user",
-											   cascade="all, delete, delete-orphan")
+			cascade="all, delete, delete-orphan")
 
 	email_verifications = db.relationship("UserEmailVerification", foreign_keys="UserEmailVerification.user_id",
-										  back_populates="user", cascade="all, delete, delete-orphan", lazy="dynamic")
+			back_populates="user", cascade="all, delete, delete-orphan", lazy="dynamic")
 
 	audit_log_entries = db.relationship("AuditLogEntry", foreign_keys="AuditLogEntry.causer_id", back_populates="causer",
-										order_by=desc("audit_log_entry_created_at"), lazy="dynamic")
+			order_by=desc("audit_log_entry_created_at"), lazy="dynamic")
 
 	maintained_packages = db.relationship("Package", lazy="dynamic", secondary="maintainers", order_by=db.asc("package_title"))
 
 	packages      = db.relationship("Package", back_populates="author", lazy="dynamic", order_by=db.asc("package_title"))
 	reviews       = db.relationship("PackageReview", back_populates="author", order_by=db.desc("package_review_created_at"), cascade="all, delete, delete-orphan")
-	review_votes  = db.relationship("PackageReviewVote", back_populates="user", cascade="all, delete, delete-orphan")
 	tokens        = db.relationship("APIToken", back_populates="owner", lazy="dynamic", cascade="all, delete, delete-orphan")
 	threads       = db.relationship("Thread", back_populates="author", lazy="dynamic", cascade="all, delete, delete-orphan")
-	replies       = db.relationship("ThreadReply", back_populates="author", lazy="dynamic", cascade="all, delete, delete-orphan", order_by=db.desc("created_at"))
-	forum_topics  = db.relationship("ForumTopic", back_populates="author", lazy="dynamic", cascade="all, delete, delete-orphan")
-	collections = db.relationship("Collection", back_populates="author", lazy="dynamic", cascade="all, delete, delete-orphan", order_by=db.asc("title"))
-	clients = db.relationship("OAuthClient", back_populates="owner", lazy="dynamic", cascade="all, delete, delete-orphan")
-
-	ban = db.relationship("UserBan", foreign_keys="UserBan.user_id", back_populates="user", uselist=False)
-
-	def get_dict(self):
-		from app.utils.flask import abs_url_for
-		return {
-			"username": self.username,
-			"display_name": self.display_name,
-			"rank": self.rank.name.lower(),
-			"profile_pic_url": self.profile_pic,
-			"website_url": self.website_url,
-			"donate_url": self.donate_url,
-			"connections": {
-				"github": self.github_username,
-				"forums": self.forums_username,
-			},
-			"links": {
-				"api_packages": abs_url_for("api.packages", author=self.username),
-				"profile": abs_url_for("users.profile", username=self.username),
-			}
-		}
+	replies       = db.relationship("ThreadReply", back_populates="author", lazy="dynamic", cascade="all, delete, delete-orphan")
 
 	def __init__(self, username=None, active=False, email=None, password=None):
 		self.username = username
+		self.email_confirmed_at = datetime.datetime.now() - datetime.timedelta(days=6000)
 		self.display_name = username
 		self.is_active = active
 		self.email = email
 		self.password = password
 		self.rank = UserRank.NOT_JOINED
 
-	def can_access_todo_list(self):
-		return Permission.APPROVE_NEW.check(self) or Permission.APPROVE_RELEASE.check(self)
+	def canAccessTodoList(self):
+		return Permission.APPROVE_NEW.check(self) or \
+				Permission.APPROVE_RELEASE.check(self) or \
+				Permission.APPROVE_CHANGES.check(self)
 
-	def get_profile_pic_url(self):
+	def isClaimed(self):
+		return self.rank.atLeast(UserRank.NEW_MEMBER)
+
+	def getProfilePicURL(self):
 		if self.profile_pic:
 			return self.profile_pic
 		elif self.rank == UserRank.BOT:
 			return "/static/bot_avatar.png"
 		else:
-			return gravatar(self.email or f"{self.username}@content.minetest.net")
+			return gravatar(self.email or "")
 
-	def check_perm(self, user, perm):
+	def checkPerm(self, user, perm):
 		if not user.is_authenticated:
 			return False
 
 		if type(perm) == str:
 			perm = Permission[perm]
 		elif type(perm) != Permission:
-			raise Exception("Unknown permission given to User.check_perm()")
+			raise Exception("Unknown permission given to User.checkPerm()")
 
 		# Members can edit their own packages, and editors can edit any packages
 		if perm == Permission.CHANGE_AUTHOR:
-			return user.rank.at_least(UserRank.EDITOR)
-		elif perm == Permission.CHANGE_USERNAMES:
-			return user.rank.at_least(UserRank.MODERATOR)
-		elif perm == Permission.CHANGE_RANK:
-			return user.rank.at_least(UserRank.MODERATOR) and not self.rank.at_least(user.rank)
+			return user.rank.atLeast(UserRank.EDITOR)
+		elif perm == Permission.CHANGE_RANK or perm == Permission.CHANGE_USERNAMES:
+			return user.rank.atLeast(UserRank.MODERATOR)
 		elif perm == Permission.CHANGE_EMAIL or perm == Permission.CHANGE_PROFILE_URLS:
-			return user == self or (user.rank.at_least(UserRank.MODERATOR) and not self.rank.at_least(user.rank))
-		elif perm == Permission.CHANGE_DISPLAY_NAME:
-			return user.rank.at_least(UserRank.NEW_MEMBER if user == self else UserRank.MODERATOR)
-		elif perm == Permission.CREATE_TOKEN or perm == Permission.CREATE_OAUTH_CLIENT:
+			return user == self or user.rank.atLeast(UserRank.ADMIN)
+		elif perm == Permission.CREATE_TOKEN:
 			if user == self:
-				return user.rank.at_least(UserRank.NEW_MEMBER)
+				return user.rank.atLeast(UserRank.MEMBER)
 			else:
-				return user.rank.at_least(UserRank.MODERATOR) and user.rank.at_least(self.rank)
+				return user.rank.atLeast(UserRank.MODERATOR) and user.rank.atLeast(self.rank)
 		else:
 			raise Exception("Permission {} is not related to users".format(perm.name))
 
-	def can_comment_ratelimit(self):
+	def canCommentRL(self):
 		from app.models import ThreadReply
 
 		factor = 1
-		if self.rank.at_least(UserRank.ADMIN):
+		if self.rank.atLeast(UserRank.ADMIN):
 			return True
-		elif self.rank.at_least(UserRank.TRUSTED_MEMBER):
-			factor = 3
-		elif self.rank.at_least(UserRank.MEMBER):
-			factor = 2
+		elif self.rank.atLeast(UserRank.TRUSTED_MEMBER):
+			factor *= 2
 
 		one_min_ago = datetime.datetime.utcnow() - datetime.timedelta(minutes=1)
 		if ThreadReply.query.filter_by(author=self) \
-				.filter(ThreadReply.created_at > one_min_ago).count() >= 2 * factor:
+				.filter(ThreadReply.created_at > one_min_ago).count() >= 3 * factor:
 			return False
 
 		hour_ago = datetime.datetime.utcnow() - datetime.timedelta(hours=1)
 		if ThreadReply.query.filter_by(author=self) \
-				.filter(ThreadReply.created_at > hour_ago).count() >= 10 * factor:
+				.filter(ThreadReply.created_at > hour_ago).count() >= 20 * factor:
 			return False
 
 		return True
 
-	def can_open_thread_ratelimit(self):
+	def canOpenThreadRL(self):
 		from app.models import Thread
 
 		factor = 1
-		if self.rank.at_least(UserRank.ADMIN):
+		if self.rank.atLeast(UserRank.ADMIN):
 			return True
-		elif self.rank.at_least(UserRank.TRUSTED_MEMBER):
-			factor = 5
-		elif self.rank.at_least(UserRank.MEMBER):
-			factor = 2
-
-		hour_ago = datetime.datetime.utcnow() - datetime.timedelta(hours=1)
-		return Thread.query.filter_by(author=self)\
-				.filter(Thread.created_at > hour_ago).count() < 2 * factor
-
-	def can_review_ratelimit(self):
-		from app.models import PackageReview
-
-		factor = 1
-		if self.rank.at_least(UserRank.ADMIN):
-			return True
-		elif self.rank.at_least(UserRank.TRUSTED_MEMBER):
+		elif self.rank.atLeast(UserRank.TRUSTED_MEMBER):
 			factor *= 5
 
-		five_mins_ago = datetime.datetime.utcnow() - datetime.timedelta(minutes=5)
-		if PackageReview.query.filter_by(author=self) \
-				.filter(PackageReview.created_at > five_mins_ago).count() > 2 * factor:
-			return False
-
 		hour_ago = datetime.datetime.utcnow() - datetime.timedelta(hours=1)
-		return PackageReview.query.filter_by(author=self) \
-				.filter(PackageReview.created_at > hour_ago).count() < 10 * factor
+		return Thread.query.filter_by(author=self) \
+			.filter(Thread.created_at > hour_ago).count() < 2 * factor
 
 	def __eq__(self, other):
 		if other is None:
@@ -325,15 +269,13 @@ class User(db.Model, UserMixin):
 		return self.id == other.id
 
 	def can_see_edit_profile(self, current_user):
-		return self.check_perm(current_user, Permission.CHANGE_USERNAMES) or \
-				self.check_perm(current_user, Permission.CHANGE_EMAIL) or \
-				self.check_perm(current_user, Permission.CHANGE_RANK)
+		return self.checkPerm(current_user, Permission.CHANGE_USERNAMES) or \
+			self.checkPerm(current_user, Permission.CHANGE_EMAIL) or \
+			self.checkPerm(current_user, Permission.CHANGE_RANK)
 
 	def can_delete(self):
 		from app.models import ForumTopic
-		return self.packages.count() == 0 and \
-			ForumTopic.query.filter_by(author=self).count() == 0 and \
-			self.rank != UserRank.BANNED
+		return self.packages.count() == 0 and ForumTopic.query.filter_by(author=self).count() == 0
 
 
 class UserEmailVerification(db.Model):
@@ -343,7 +285,6 @@ class UserEmailVerification(db.Model):
 	token   = db.Column(db.String(32), nullable=True)
 	user    = db.relationship("User", foreign_keys=[user_id], back_populates="email_verifications")
 	is_password_reset = db.Column(db.Boolean, nullable=False, default=False)
-	created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
 
 
 class EmailSubscription(db.Model):
@@ -357,11 +298,6 @@ class EmailSubscription(db.Model):
 		self.blacklisted = False
 		self.token = None
 
-	@property
-	def url(self):
-		from app.utils import abs_url_for
-		return abs_url_for('users.unsubscribe', token=self.token)
-
 
 class NotificationType(enum.Enum):
 	# Package / release / etc
@@ -395,10 +331,10 @@ class NotificationType(enum.Enum):
 	OTHER          = 0
 
 
-	def get_title(self):
+	def getTitle(self):
 		return self.name.replace("_", " ").title()
 
-	def to_name(self):
+	def toName(self):
 		return self.name.lower()
 
 	def get_description(self):
@@ -433,11 +369,11 @@ class NotificationType(enum.Enum):
 
 	@classmethod
 	def choices(cls):
-		return [(choice, choice.get_title()) for choice in cls]
+		return [(choice, choice.getTitle()) for choice in cls]
 
 	@classmethod
 	def coerce(cls, item):
-		return item if type(item) == NotificationType else NotificationType[item.upper()]
+		return item if type(item) == NotificationType else NotificationType[item]
 
 
 class Notification(db.Model):
@@ -515,55 +451,18 @@ class UserNotificationPreferences(db.Model):
 		self.pref_other = 0
 
 	def get_can_email(self, notification_type):
-		return getattr(self, "pref_" + notification_type.to_name()) == 2
+		return getattr(self, "pref_" + notification_type.toName()) == 2
 
 	def set_can_email(self, notification_type, value):
 		value = 2 if value else 0
-		setattr(self, "pref_" + notification_type.to_name(), value)
+		setattr(self, "pref_" + notification_type.toName(), value)
 
 	def get_can_digest(self, notification_type):
-		return getattr(self, "pref_" + notification_type.to_name()) >= 1
+		return getattr(self, "pref_" + notification_type.toName()) >= 1
 
 	def set_can_digest(self, notification_type, value):
 		if self.get_can_email(notification_type):
 			return
 
 		value = 1 if value else 0
-		setattr(self, "pref_" + notification_type.to_name(), value)
-
-
-class UserBan(db.Model):
-	user_id = db.Column(db.Integer, db.ForeignKey('user.id'), primary_key=True)
-	user = db.relationship("User", foreign_keys=[user_id], back_populates="ban")
-
-	message = db.Column(db.UnicodeText, nullable=False)
-
-	banned_by_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False)
-	banned_by = db.relationship("User", foreign_keys=[banned_by_id])
-
-	created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
-
-	expires_at = db.Column(db.DateTime, nullable=True, default=None)
-
-	@property
-	def has_expired(self):
-		return self.expires_at and datetime.datetime.now() > self.expires_at
-
-
-class OAuthClient(db.Model):
-	__tablename__ = "oauth_client"
-
-	id = db.Column(db.String(24), primary_key=True)
-	title = db.Column(db.String(64), unique=True, nullable=False)
-	description = db.Column(db.String(300), nullable=True)
-	secret = db.Column(db.String(32), nullable=False)
-	redirect_url = db.Column(db.String(128), nullable=False)
-	approved = db.Column(db.Boolean, nullable=False, default=False)
-	verified = db.Column(db.Boolean, nullable=False, default=False)
-
-	owner_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False)
-	owner = db.relationship("User", foreign_keys=[owner_id], back_populates="clients")
-
-	tokens = db.relationship("APIToken", back_populates="client", lazy="dynamic", cascade="all, delete, delete-orphan")
-
-	created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
+		setattr(self, "pref_" + notification_type.toName(), value)

app/public/robots.txt

@@ -1,4 +0,0 @@
-User-agent: *
-Disallow: /packages/*/*/download/
-Disallow: /packages/*/*/releases/*/download/
-Disallow: /report/